modemmanager: cleanup vars in proto_modemmanager_setup

Group variables into blocks to improve readability.

Signed-off-by: Florian Eckert <redacted>

diff --git a/net/modemmanager/files/lib/netifd/proto/modemmanager.sh b/net/modemmanager/files/lib/netifd/proto/modemmanager.sh
index 1b72a91bcd8e5c09094dc56d68d223025da04119..72ae658f0cb36b9826b43fbca7989dda11b1307f 100644 (file)
--- a/net/modemmanager/files/lib/netifd/proto/modemmanager.sh
+++ b/net/modemmanager/files/lib/netifd/proto/modemmanager.sh
@@ -573,26 +573,25 @@ proto_modemmanager_setup() {
        local modempath modemstatus bearercount bearerpath connectargs bearerstatus beareriface
        local bearermethod_ipv4 bearermethod_ipv6 auth cliauth
        local operatorname operatorid registration accesstech signalquality
-       local allowedmode preferredmode
 
        local device apn allowedauth username password pincode
        local iptype plmn metric signalrate allow_roaming
-       local force_connection
+       local allowedmode preferredmode force_connection
+       local sourcefilter
+       json_get_vars device apn allowedauth username password pincode
+       json_get_vars iptype plmn metric signalrate allow_roaming
+       json_get_vars allowedmode preferredmode force_connection
+       json_get_vars sourcefilter
 
        local init_epsbearer
        local init_iptype init_allowedauth
        local init_password init_user init_apn
-
-       local address prefix gateway mtu dns1 dns2
-
-       json_get_vars device apn allowedauth username password
-       json_get_vars pincode iptype sourcefilter plmn metric signalrate allow_roaming
-       json_get_vars allowedmode preferredmode force_connection
-
        json_get_vars init_epsbearer
        json_get_vars init_iptype init_allowedauth
        json_get_vars init_password init_user init_apn
 
+       local address prefix gateway mtu dns1 dns2
+
        # validate sysfs path given in config
        [ -n "${device}" ] || {
                echo "No device specified"