From: Leon M. Busch-George Date: Sat, 19 Oct 2024 09:43:23 +0000 (+0200) Subject: qmi: sort config variables a little and fix minor bugs X-Git-Tag: v24.10.2~51 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=871d7a9d68c568c57ce845bb60ff7fa83db18f2d;p=thirdparty%2Fopenwrt.git qmi: 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 (cherry picked from commit bf768867dc0eea6b51d2db90a8f1380cc52529c1) Signed-off-by: Felix Baumann Link: https://github.com/openwrt/openwrt/pull/18965 Signed-off-by: Hauke Mehrtens --- diff --git a/package/network/utils/uqmi/files/lib/netifd/proto/qmi.sh b/package/network/utils/uqmi/files/lib/netifd/proto/qmi.sh index 8ec577a90b7..b08b2251048 100755 --- a/package/network/utils/uqmi/files/lib/netifd/proto/qmi.sh +++ b/package/network/utils/uqmi/files/lib/netifd/proto/qmi.sh @@ -34,17 +34,20 @@ proto_qmi_init_config() { proto_qmi_setup() { local interface="$1" - local dataformat connstat plmn_mode mcc mnc - local device apn v6apn auth username password pincode delay modes pdptype - local profile v6profile dhcp dhcpv6 autoconnect plmn timeout mtu $PROTO_DEFAULT_OPTIONS - local ip4table ip6table - local cid_4 pdh_4 cid_6 pdh_6 - local ip_6 ip_prefix_length gateway_6 dns1_6 dns2_6 + + local connstat dataformat mcc mnc plmn_mode + local cid_4 cid_6 pdh_4 pdh_6 + local dns1_6 dns2_6 gateway_6 ip_6 ip_prefix_length local profile_pdptype - json_get_vars device apn v6apn auth username password pincode delay modes - json_get_vars pdptype profile v6profile dhcp dhcpv6 sourcefilter delegate autoconnect plmn ip4table - json_get_vars ip6table timeout mtu $PROTO_DEFAULT_OPTIONS + local delegate ip4table ip6table mtu sourcefilter $PROTO_DEFAULT_OPTIONS + json_get_vars delegate ip4table ip6table mtu sourcefilter $PROTO_DEFAULT_OPTIONS + + local apn auth delay device modes password pdptype pincode username v6apn + json_get_vars apn auth delay device modes password pdptype pincode username v6apn + + local profile v6profile dhcp dhcpv6 autoconnect plmn timeout + json_get_vars profile v6profile dhcp dhcpv6 autoconnect plmn timeout [ "$timeout" = "" ] && timeout="10"