Merge pull request #23551 from dnlplm/dp/mm-qmap-fix
authorFlorian Eckert <fe@dev.tdt.de>
Thu, 7 Mar 2024 08:57:19 +0000 (09:57 +0100)
committerGitHub <noreply@github.com>
Thu, 7 Mar 2024 08:57:19 +0000 (09:57 +0100)
modemmanager: report events for virtual netdevices

net/modemmanager/Makefile
net/modemmanager/files/usr/share/ModemManager/modemmanager.common

index 97f8dce06a60a74e28c1a1489b2774458cce4377..8759cd4054e4606cd0cb5a94949d97cf1ea4d098 100644 (file)
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=modemmanager
 PKG_SOURCE_VERSION:=1.22.0
-PKG_RELEASE:=11
+PKG_RELEASE:=12
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://gitlab.freedesktop.org/mobile-broadband/ModemManager.git
index ab5f92b982292d8abebd7c3ec1fea961ea465817..0315673d88bf9f597f4a8d9d578339337b9bbcde 100644 (file)
@@ -130,7 +130,20 @@ mm_report_event() {
        virtual="$(echo "$sysfspath" | cut -d'/' -f4)"
        [ "$virtual" = "virtual" ] && {
                mm_log "debug" "sysfspath is a virtual device ($sysfspath)"
-               return
+               case "$name" in
+                       "qmapmux"*)
+                               mm_log "debug" "rmnet netdevice $name"
+                               ;;
+                       "qmimux"*)
+                               mm_log "debug" "qmi_wwan qmap netdevice $name"
+                               ;;
+                       "mbimmux"*)
+                               mm_log "debug" "mbim vlan netdevice $name"
+                               ;;
+                       *)
+                               return
+                               ;;
+               esac
        }
 
        # Track/untrack events in cache