From: Florian Eckert <redacted>
Date: Tue, 5 Nov 2024 07:55:40 +0000 (+0100)
Subject: modemmanager: reset to 'no' plmn if nothing is configured
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=fa6198e36b77dadaeb8110d48ab456b82ce21815;p=openwrt-packages.git

modemmanager: reset to 'no' plmn if nothing is configured

If a configured 'plmn' is deleted from the configuration between a connection
setup, it will continue to be used because the modem remembers it.

Therefore, the 'plmn' stored in the modem must be deleted when a new
connection is established if it is no longer in the configuration.

Signed-off-by: Florian Eckert <redacted>
---

diff --git a/net/modemmanager/files/lib/netifd/proto/modemmanager.sh b/net/modemmanager/files/lib/netifd/proto/modemmanager.sh
index f5f91c0ea..0aacc9f90 100644
--- a/net/modemmanager/files/lib/netifd/proto/modemmanager.sh
+++ b/net/modemmanager/files/lib/netifd/proto/modemmanager.sh
@@ -673,11 +673,14 @@ proto_modemmanager_setup() {
 		[ "$?" -ne "0" ] && return 1
 	fi
 
-	[ -z "${plmn}" ] || {
+	if [ -z "${plmn}" ]; then
+		modemmanager_set_plmn "$device" "$interface" "" "$force_connection"
+		[ "$?" -ne "0" ] && return 1
+	else
 		echo "starting network registration with plmn '${plmn}'..."
 		modemmanager_set_plmn "$device" "$interface" "$plmn" "$force_connection"
 		[ "$?" -ne "0" ] && return 1
-	}
+	fi
 
 	# setup connect args; APN mandatory (even if it may be empty)
 	echo "starting connection with apn '${apn}'..."