aboutsummaryrefslogtreecommitdiff
path: root/src/80-mm-candidate.rules
diff options
context:
space:
mode:
authorAleksander Morgado <aleksander@aleksander.es>2020-11-06 12:27:40 +0100
committerAleksander Morgado <aleksander@aleksander.es>2020-11-13 08:57:06 +0000
commit950abbf8ee8624827d63a0d0186beac81232e8f6 (patch)
tree675ff1b0231b196af7530041d167cca7eb4d17fa /src/80-mm-candidate.rules
parent519df2544b04ccbc9cf87fbfbdbbaf44edeef75b (diff)
core: stop monitoring the 'usb' subsystem
Back in Linux < 3.6 days, the cdc-wdm ports exposed by the QMI driver were flagged as owned by the 'usb' subsystem. That changed in 3.6 when the subsystem was renamed to 'usbmisc': https://mail.gnome.org/archives/networkmanager-list/2012-June/msg00125.html This patch removes all monitoring of the 'usb' subsystem completely, which is anyway a valid subsystem but for which we shouldn't need any special handling. Right now, with newer kernels, we were using that monitoring exclusively to get notified of full USB device remove events, which is really not required as we already process the port removals one by one. We simplify the logic everywhere that attempted to match either the 'usb' or 'usbmisc' subsystems, and we no longer require the explicit checks for the port name being named 'cdc-wdm[0-9]*' in the code, as that is already taken care of by the ID_MM_CANDIDATE udev tag rule.
Diffstat (limited to 'src/80-mm-candidate.rules')
-rw-r--r--src/80-mm-candidate.rules3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/80-mm-candidate.rules b/src/80-mm-candidate.rules
index 3d9cd6e7..7e7988e5 100644
--- a/src/80-mm-candidate.rules
+++ b/src/80-mm-candidate.rules
@@ -15,7 +15,6 @@ KERNEL=="rfcomm*", DEVPATH=="*/virtual/*", GOTO="mm_candidate_end"
SUBSYSTEM=="tty", ENV{ID_MM_CANDIDATE}="1"
SUBSYSTEM=="net", ENV{ID_MM_CANDIDATE}="1"
-KERNEL=="cdc-wdm*", SUBSYSTEM=="usb", ENV{ID_MM_CANDIDATE}="1"
-KERNEL=="cdc-wdm*", SUBSYSTEM=="usbmisc", ENV{ID_MM_CANDIDATE}="1"
+KERNEL=="cdc-wdm[0-9]*", SUBSYSTEM=="usbmisc", ENV{ID_MM_CANDIDATE}="1"
LABEL="mm_candidate_end"