uqmi: configure PDP type and APN to modem

Configure the PLMN and APN to the modem. This is required in cases,
where either the SGSN or GGSN does not permit the selection of IPv4v6
pdp type.

Previously, the modem always tried to establish a dual-stacked PDP
context regardless of the configured PDP type in uci. As this setting
can not be parameterized when creating a WDS context, configure it to
the modems internal list of profiles. This way, the PDP type is taken
into account when creating the WDS context.

Signed-off-by: David Bauer <mail@david-bauer.net>

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 7b93a03ee50f6361aeacb7c2b2c6bec3d3c5ecdb..f8e655455a54b591dab00b4fbde2d91a061591fa 100755 (executable)
--- a/package/network/utils/uqmi/files/lib/netifd/proto/qmi.sh
+++ b/package/network/utils/uqmi/files/lib/netifd/proto/qmi.sh
@@ -38,6 +38,7 @@ proto_qmi_setup() {
        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 profile_pdptype
 
        json_get_vars device apn v6apn auth username password pincode delay modes
        json_get_vars pdptype profile v6profile dhcp dhcpv6 autoconnect plmn ip4table
@@ -296,6 +297,13 @@ proto_qmi_setup() {
 
        [ "$pdptype" = "ip" -o "$pdptype" = "ipv6" -o "$pdptype" = "ipv4v6" ] || pdptype="ip"
 
+       # Configure PDP type and APN for profile 1.
+       # In case GGSN rejects IPv4v6 PDP, modem might not be able to
+       # establish a non-LTE data session.
+       profile_pdptype="$pdptype"
+       [ "$profile_pdptype" = "ip" ] && profile_pdptype="ipv4"
+       uqmi -s -d "$device" --modify-profile "3gpp,1" --apn "$apn" --pdp-type "$profile_pdptype" > /dev/null 2>&1
+
        if [ "$pdptype" = "ip" ]; then
                [ -z "$autoconnect" ] && autoconnect=1
                [ "$autoconnect" = 0 ] && autoconnect=""