uqmi: use general method for state cleaning
authorKoen Vandeputte <koen.vandeputte@ncentric.com>
Thu, 15 Feb 2018 14:16:01 +0000 (15:16 +0100)
committerJohn Crispin <john@phrozen.org>
Sun, 18 Feb 2018 08:34:32 +0000 (09:34 +0100)
Debugging shows that using the general method properly cleans on each
run, while the method specifying the client-ID shows "No effect"
even while in connected state.

Fixes several connectivity issues seen on specific modems.

Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
package/network/utils/uqmi/files/lib/netifd/proto/qmi.sh

index 1619c2b..eba0922 100755 (executable)
@@ -97,6 +97,10 @@ proto_qmi_setup() {
                }
        }
 
+       # Cleanup current state if any
+       uqmi -s -d "$device" --stop-network 0xffffffff --autoconnect
+
+       # Set IP format
        uqmi -s -d "$device" --set-data-format 802.3
        uqmi -s -d "$device" --wda-set-data-format 802.3
        dataformat="$(uqmi -s -d "$device" --wda-get-data-format)"
@@ -144,11 +148,6 @@ proto_qmi_setup() {
 
                uqmi -s -d "$device" --set-client-id wds,"$cid_4" --set-ip-family ipv4 > /dev/null
 
-               # try to clear previous autoconnect state
-               uqmi -s -d "$device" --set-client-id wds,"$cid_4" \
-                       --stop-network 0xffffffff \
-                       --autoconnect > /dev/null
-
                pdh_4=$(uqmi -s -d "$device" --set-client-id wds,"$cid_4" \
                        --start-network \
                        ${apn:+--apn $apn} \
@@ -175,11 +174,6 @@ proto_qmi_setup() {
 
                uqmi -s -d "$device" --set-client-id wds,"$cid_6" --set-ip-family ipv6 > /dev/null
 
-               # try to clear previous autoconnect state
-               uqmi -s -d "$device" --set-client-id wds,"$cid_6" \
-                       --stop-network 0xffffffff \
-                       --autoconnect > /dev/null
-
                pdh_6=$(uqmi -s -d "$device" --set-client-id wds,"$cid_6" \
                        --start-network \
                        ${apn:+--apn $apn} \