[openwrt/openwrt] comgt: fix hotplug event handling

LEDE Commits lede-commits at lists.infradead.org
Sat Sep 19 13:48:50 EDT 2020


jow pushed a commit to openwrt/openwrt.git, branch openwrt-19.07:
https://git.openwrt.org/86b44028e2123a199d9ff9cfc1585696bed7af53

commit 86b44028e2123a199d9ff9cfc1585696bed7af53
Author: Rozhuk Ivan <rozhuk.im at gmail.com>
AuthorDate: Sat Nov 16 05:10:05 2019 +0300

    comgt: fix hotplug event handling
    
    Hotplug manager send: "remove" -> "add" -> "bind" events,
    script interpret bind as "not add" = "remove" and mark device
    as unavailable.
    
    Signed-off-by: Rozhuk Ivan <rozhuk.im at gmail.com>
    Signed-off-by: Hans Dedecker <dedeckeh at gmail.com> [PKG_RELEASE increase]
    (cherry picked from commit 4821ff064b735c320ae2625a739018d1fc7d6457)
    Fixes: FS#3351
    Signed-off-by: Jo-Philipp Wich <jo at mein.io>
---
 package/network/utils/comgt/Makefile     | 2 +-
 package/network/utils/comgt/files/3g.usb | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package/network/utils/comgt/Makefile b/package/network/utils/comgt/Makefile
index 64296c9852..db5ea57473 100644
--- a/package/network/utils/comgt/Makefile
+++ b/package/network/utils/comgt/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=comgt
 PKG_VERSION:=0.32
-PKG_RELEASE:=32
+PKG_RELEASE:=33
 
 PKG_SOURCE:=$(PKG_NAME).$(PKG_VERSION).tgz
 PKG_SOURCE_URL:=@SF/comgt
diff --git a/package/network/utils/comgt/files/3g.usb b/package/network/utils/comgt/files/3g.usb
index ac8326b710..8f0d62ca83 100644
--- a/package/network/utils/comgt/files/3g.usb
+++ b/package/network/utils/comgt/files/3g.usb
@@ -15,11 +15,11 @@ find_3g_iface() {
 
 	if [ "${dev##*/}" = "${tty##*/}" ]; then
 		if [ "$ACTION" = add ]; then
-			available=1
-		else
-			available=0
+			proto_set_available "$cfg" 1
+		fi
+		if [ "$ACTION" = remove ]; then
+			proto_set_available "$cfg" 0
 		fi
-		proto_set_available "$cfg" $available
 	fi
 }
 



More information about the lede-commits mailing list