uqmi: fix raw-ip mode for newer lte modems

[openwrt/openwrt.git] / package / network / utils / uqmi / files / lib / netifd / proto / qmi.sh

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 079c2299284bf26c0cc33ce4d9476b9d06a5ef1b..9a534d4b96d7b1f82b63f6c0497834001230ee73 100755 (executable)
--- a/package/network/utils/uqmi/files/lib/netifd/proto/qmi.sh
+++ b/package/network/utils/uqmi/files/lib/netifd/proto/qmi.sh
@@ -27,7 +27,7 @@ proto_qmi_init_config() {
 
 proto_qmi_setup() {
        local interface="$1"
-
+       local dataformat
        local device apn auth username password pincode delay modes pdptype profile dhcpv6 autoconnect plmn $PROTO_DEFAULT_OPTIONS
        local cid_4 pdh_4 cid_6 pdh_6
        local ip_6 ip_prefix_length gateway_6 dns1_6 dns2_6
@@ -99,6 +99,19 @@ proto_qmi_setup() {
 
        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)"
+
+       if [ "$dataformat" = '"raw-ip"' ]; then
+
+               [ -f /sys/class/net/$ifname/qmi/raw_ip ] || {
+                       echo "Device only supports raw-ip mode but is missing this required driver attribute: /sys/class/net/$ifname/qmi/raw_ip"
+                       return 1
+               }
+
+               echo "Device does not support 802.3 mode. Informing driver of raw-ip only for $ifname .."
+               echo "Y" > /sys/class/net/$ifname/qmi/raw_ip
+       fi
+
        uqmi -s -d "$device" --sync
 
        echo "Waiting for network registration"
@@ -111,7 +124,7 @@ proto_qmi_setup() {
 
        echo "Starting network $interface"
 
-       pdptype=`echo "$pdptype" | awk '{print tolower($0)}'`
+       pdptype=$(echo "$pdptype" | awk '{print tolower($0)}')
        [ "$pdptype" = "ip" -o "$pdptype" = "ipv6" -o "$pdptype" = "ipv4v6" ] || pdptype="ip"
 
        if [ "$pdptype" = "ip" ]; then
@@ -122,7 +135,7 @@ proto_qmi_setup() {
        fi
 
        [ "$pdptype" = "ip" -o "$pdptype" = "ipv4v6" ] && {
-               cid_4=`uqmi -s -d "$device" --get-client-id wds`
+               cid_4=$(uqmi -s -d "$device" --get-client-id wds)
                [ $? -ne 0 ] && {
                        echo "Unable to obtain client ID"
                        proto_notify_error "$interface" NO_CID
@@ -136,14 +149,14 @@ proto_qmi_setup() {
                        --stop-network 0xffffffff \
                        --autoconnect > /dev/null
 
-               pdh_4=`uqmi -s -d "$device" --set-client-id wds,"$cid_4" \
+               pdh_4=$(uqmi -s -d "$device" --set-client-id wds,"$cid_4" \
                        --start-network \
                        ${apn:+--apn $apn} \
                        ${profile:+--profile $profile} \
                        ${auth:+--auth-type $auth} \
                        ${username:+--username $username} \
                        ${password:+--password $password} \
-                       ${autoconnect:+--autoconnect}`
+                       ${autoconnect:+--autoconnect})
                [ $? -ne 0 ] && {
                        echo "Unable to connect IPv4"
                        uqmi -s -d "$device" --set-client-id wds,"$cid_4" --release-client-id wds
@@ -153,7 +166,7 @@ proto_qmi_setup() {
        }
 
        [ "$pdptype" = "ipv6" -o "$pdptype" = "ipv4v6" ] && {
-               cid_6=`uqmi -s -d "$device" --get-client-id wds`
+               cid_6=$(uqmi -s -d "$device" --get-client-id wds)
                [ $? -ne 0 ] && {
                        echo "Unable to obtain client ID"
                        proto_notify_error "$interface" NO_CID
@@ -167,14 +180,14 @@ proto_qmi_setup() {
                        --stop-network 0xffffffff \
                        --autoconnect > /dev/null
 
-               pdh_6=`uqmi -s -d "$device" --set-client-id wds,"$cid_6" \
+               pdh_6=$(uqmi -s -d "$device" --set-client-id wds,"$cid_6" \
                        --start-network \
                        ${apn:+--apn $apn} \
                        ${profile:+--profile $profile} \
                        ${auth:+--auth-type $auth} \
                        ${username:+--username $username} \
                        ${password:+--password $password} \
-                       ${autoconnect:+--autoconnect}`
+                       ${autoconnect:+--autoconnect})
                [ $? -ne 0 ] && {
                        echo "Unable to connect IPv6"
                        uqmi -s -d "$device" --set-client-id wds,"$cid_6" --release-client-id wds