mbim: sort config variables a little and fix minor bugs

Group 'local' declarations and 'json_get_vars', sort alphabetically within groups, and split off more generic parameters.

- delegate and sourcefilter were not declared as local variables

Signed-off-by: Leon M. Busch-George <leon@georgemail.eu>
Link: https://github.com/openwrt/openwrt/pull/16734
Signed-off-by: John Crispin <john@phrozen.org>

diff --git a/package/network/utils/umbim/files/lib/netifd/proto/mbim.sh b/package/network/utils/umbim/files/lib/netifd/proto/mbim.sh
index 75b914e8aac1ef487201b96f2df1f065da1016b5..01e8628d7460cdc7e2e0717963eeb28815f625e6 100755 (executable)
--- a/package/network/utils/umbim/files/lib/netifd/proto/mbim.sh
+++ b/package/network/utils/umbim/files/lib/netifd/proto/mbim.sh
@@ -46,10 +46,14 @@ _proto_mbim_setup() {
        local tid=2
        local ret
 
-       local device apn pincode delay auth username password allow_roaming allow_partner
-       local dhcp dhcpv6 pdptype ip4table ip6table mtu $PROTO_DEFAULT_OPTIONS
-       json_get_vars device apn pincode delay auth username password allow_roaming allow_partner
-       json_get_vars dhcp dhcpv6 sourcefilter delegate pdptype ip4table ip6table mtu $PROTO_DEFAULT_OPTIONS
+       local allow_partner allow_roaming apn auth delay device password pincode username
+       json_get_vars allow_partner allow_roaming apn auth delay device password pincode username
+
+       local dhcp dhcpv6 pdptype
+       json_get_vars dhcp dhcpv6 pdptype
+
+       local delegate ip4table ip6table mtu sourcefilter $PROTO_DEFAULT_OPTIONS
+       json_get_vars delegate ip4table ip6table mtu sourcefilter $PROTO_DEFAULT_OPTIONS
 
        [ ! -e /proc/sys/net/ipv6 ] && ipv6=0 || json_get_var ipv6 ipv6