From 3a5aa8a387d82e0e02a67bfa96a050c2f01d6edf Mon Sep 17 00:00:00 2001 From: Florian Eckert Date: Tue, 5 Nov 2024 08:37:02 +0100 Subject: [PATCH] modemmanager: swap plmn and technology set command in the proto In the current implementation of the modemmanager 'proto', if a 'plmn' and a 'technology' is configured, the 'plmn' is set first and then second the 'technology' on a 'proto' setup. However, this is problematic if a 'technology' has already been set in an earlier run. It is possible, that this previously set 'technology' is not available at the current location, as the modem remembers the setting. To fix this, first set the technology and then the plmn. Signed-off-by: Florian Eckert --- .../files/lib/netifd/proto/modemmanager.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/net/modemmanager/files/lib/netifd/proto/modemmanager.sh b/net/modemmanager/files/lib/netifd/proto/modemmanager.sh index 295f776744..f5f91c0eae 100644 --- a/net/modemmanager/files/lib/netifd/proto/modemmanager.sh +++ b/net/modemmanager/files/lib/netifd/proto/modemmanager.sh @@ -644,12 +644,6 @@ proto_modemmanager_setup() { [ "$?" -ne "0" ] && return 1 } - [ -z "${plmn}" ] || { - echo "starting network registration with plmn '${plmn}'..." - modemmanager_set_plmn "$device" "$interface" "$plmn" "$force_connection" - [ "$?" -ne "0" ] && return 1 - } - if [ -z "${allowedmode}" ]; then modemmanager_set_allowed_mode "$device" "$interface" "any" else @@ -679,6 +673,12 @@ proto_modemmanager_setup() { [ "$?" -ne "0" ] && return 1 fi + [ -z "${plmn}" ] || { + echo "starting network registration with plmn '${plmn}'..." + modemmanager_set_plmn "$device" "$interface" "$plmn" "$force_connection" + [ "$?" -ne "0" ] && return 1 + } + # setup connect args; APN mandatory (even if it may be empty) echo "starting connection with apn '${apn}'..." -- 2.30.2