diff --git a/net/modemmanager/Makefile b/net/modemmanager/Makefile index 2537900eb6e31..47b973604c72a 100644 --- a/net/modemmanager/Makefile +++ b/net/modemmanager/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=modemmanager PKG_VERSION:=1.24.0 -PKG_RELEASE:=14 +PKG_RELEASE:=15 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://gitlab.freedesktop.org/mobile-broadband/ModemManager.git diff --git a/net/modemmanager/files/etc/hotplug.d/net/25-modemmanager-net b/net/modemmanager/files/etc/hotplug.d/net/25-modemmanager-net index 1730934f2ea28..272e7343ff1ab 100644 --- a/net/modemmanager/files/etc/hotplug.d/net/25-modemmanager-net +++ b/net/modemmanager/files/etc/hotplug.d/net/25-modemmanager-net @@ -8,19 +8,12 @@ # We require a interface name [ -n "${INTERFACE}" ] || exit -# Virtual net devices (SQM IFB, GRE, bridges, veth, tun/tap, ...) -# can never be modems; mm_report_event drops them internally, skip -# the log-noisy hotplug script entirely. -case "${DEVPATH}" in - /devices/virtual/*) exit ;; -esac - # Always make sure the rundir exists mkdir -m 0755 -p "${MODEMMANAGER_RUNDIR}" # Report network interface +mm_report_event "${ACTION}" "${INTERFACE}" "net" "/sys${DEVPATH}" || exit mm_log "info" "${ACTION} network interface ${INTERFACE}: event processed" -mm_report_event "${ACTION}" "${INTERFACE}" "net" "/sys${DEVPATH}" # Look for an associated cdc-wdm interface @@ -33,6 +26,6 @@ esac # Report cdc-wdm device, if any [ -n "${cdcwdm}" ] && { - mm_log "info" "${ACTION} cdc interface ${cdcwdm}: custom event processed" - mm_report_event "${ACTION}" "${cdcwdm}" "usbmisc" "/sys${DEVPATH}" + mm_report_event "${ACTION}" "${cdcwdm}" "usbmisc" "/sys${DEVPATH}" && + mm_log "info" "${ACTION} cdc interface ${cdcwdm}: custom event processed" } diff --git a/net/modemmanager/files/etc/hotplug.d/tty/25-modemmanager-tty b/net/modemmanager/files/etc/hotplug.d/tty/25-modemmanager-tty index 5d1042cdd25d4..c713912c480e6 100644 --- a/net/modemmanager/files/etc/hotplug.d/tty/25-modemmanager-tty +++ b/net/modemmanager/files/etc/hotplug.d/tty/25-modemmanager-tty @@ -12,5 +12,5 @@ mkdir -m 0755 -p "${MODEMMANAGER_RUNDIR}" # Report TTY +mm_report_event "${ACTION}" "${DEVNAME}" "tty" "/sys${DEVPATH}" || exit mm_log "info" "${ACTION} serial interface ${DEVNAME}: event processed" -mm_report_event "${ACTION}" "${DEVNAME}" "tty" "/sys${DEVPATH}" diff --git a/net/modemmanager/files/etc/hotplug.d/wwan/25-modemmanager-wwan b/net/modemmanager/files/etc/hotplug.d/wwan/25-modemmanager-wwan index b36ade478054c..65a69eb86938c 100644 --- a/net/modemmanager/files/etc/hotplug.d/wwan/25-modemmanager-wwan +++ b/net/modemmanager/files/etc/hotplug.d/wwan/25-modemmanager-wwan @@ -11,5 +11,5 @@ mkdir -m 0755 -p "${MODEMMANAGER_RUNDIR}" # Report wwan +mm_report_event "${ACTION}" "${DEVNAME}" "wwan" "/sys${DEVPATH}" || exit mm_log "info" "${ACTION} wwan control port ${DEVNAME}: event processed" -mm_report_event "${ACTION}" "${DEVNAME}" "wwan" "/sys${DEVPATH}" diff --git a/net/modemmanager/files/usr/share/ModemManager/modemmanager.common b/net/modemmanager/files/usr/share/ModemManager/modemmanager.common index 2e07082dfefa7..b33de0614f849 100644 --- a/net/modemmanager/files/usr/share/ModemManager/modemmanager.common +++ b/net/modemmanager/files/usr/share/ModemManager/modemmanager.common @@ -140,7 +140,7 @@ mm_report_event() { mm_log "debug" "mbim vlan netdevice $name" ;; *) - return + return 1 ;; esac } @@ -161,7 +161,7 @@ mm_report_event() { # Skip live report if MM isn't up; wrapper will replay from cache. if [ ! -s "${MODEMMANAGER_PID_FILE}" ] || \ ! kill -0 "$(cat "${MODEMMANAGER_PID_FILE}" 2>/dev/null)" 2>/dev/null; then - return + return 0 fi # Report the event @@ -170,6 +170,8 @@ mm_report_event() { if [ "$?" -ne "0" ]; then mm_log "error" "Couldn't report kernel event: ${result}" fi + + return 0 } mm_report_event_from_cache_line() {