summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Eckert <fe@dev.tdt.de>2024-01-18 16:08:59 +0100
committerFlorian Eckert <fe@dev.tdt.de>2024-01-19 08:31:17 +0100
commit620afc1806d0a2196a4280b68f93990443b4f4e5 (patch)
tree03434308d308136ca8904ce43cb35101ffa6b62b
parent85bdad926939b7bc93aca15254a6d84d9f47a3a7 (diff)
modemmanager: set allowedmode to 'any' if nothing is configured
The modem saves the permitted technology configuration in the modem itself. If the technology configuration is deleted in the uci, this is not passed on to the modem. This means that the previously saved technology configuration is remains in the modem and is therefore still active. By setting the technology to 'any', if no option is set, all technologies are allowed again. Signed-off-by: Florian Eckert <fe@dev.tdt.de>
-rw-r--r--net/modemmanager/Makefile2
-rwxr-xr-xnet/modemmanager/files/modemmanager.proto6
2 files changed, 5 insertions, 3 deletions
diff --git a/net/modemmanager/Makefile b/net/modemmanager/Makefile
index 2b455512f..f327b1486 100644
--- a/net/modemmanager/Makefile
+++ b/net/modemmanager/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=modemmanager
PKG_SOURCE_VERSION:=1.22.0
-PKG_RELEASE:=7
+PKG_RELEASE:=8
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://gitlab.freedesktop.org/mobile-broadband/ModemManager.git
diff --git a/net/modemmanager/files/modemmanager.proto b/net/modemmanager/files/modemmanager.proto
index afbe2397f..671f0db15 100755
--- a/net/modemmanager/files/modemmanager.proto
+++ b/net/modemmanager/files/modemmanager.proto
@@ -523,7 +523,9 @@ proto_modemmanager_setup() {
modemmanager_check_state "$device" "${modemstatus}" "$pincode"
[ "$?" -ne "0" ] && return 1
- [ -z "${allowedmode}" ] || {
+ if [ -z "${allowedmode}" ]; then
+ modemmanager_set_allowed_mode "$device" "$interface" "any"
+ else
case "$allowedmode" in
"2g")
modemmanager_set_allowed_mode "$device" \
@@ -548,7 +550,7 @@ proto_modemmanager_setup() {
esac
# check error for allowed_mode and preferred_mode function call
[ "$?" -ne "0" ] && return 1
- }
+ fi
# always cleanup before attempting a new connection, just in case
modemmanager_cleanup_connection "${modemstatus}"