[PATCH 09/14] mbm, udev: additional per-vendor conditions for quicker processing

[Aleksander Morgado]

---
 plugins/mbm/77-mm-ericsson-mbm.rules | 32 ++++++++++++++++++++++++++++----
 1 file changed, 28 insertions(+), 4 deletions(-)

diff --git a/plugins/mbm/77-mm-ericsson-mbm.rules b/plugins/mbm/77-mm-ericsson-mbm.rules
index 3dfed02..c195a86 100644
--- a/plugins/mbm/77-mm-ericsson-mbm.rules
+++ b/plugins/mbm/77-mm-ericsson-mbm.rules
@@ -1,10 +1,16 @@
 # do not edit this file, it will be overwritten on update
 
 ACTION!="add|change|move", GOTO="mm_mbm_end"
-SUBSYSTEMS=="usb", GOTO="mm_mbm_check"
+SUBSYSTEMS!="usb", GOTO="mm_mbm_end"
+
+ATTRS{idVendor}=="0bdb", GOTO="mm_mbm_ericsson_vendorcheck"
+ATTRS{idVendor}=="0fce", GOTO="mm_mbm_sony_vendorcheck"
+ATTRS{idVendor}=="413c", GOTO="mm_mbm_dell_vendorcheck"
+ATTRS{idVendor}=="03f0", GOTO="mm_mbm_hp_vendorcheck"
+ATTRS{idVendor}=="0930", GOTO="mm_mbm_toshiba_vendorcheck"
 GOTO="mm_mbm_end"
 
-LABEL="mm_mbm_check"
+LABEL="mm_mbm_ericsson_vendorcheck"
 
 # Ericsson F3507g
 ATTRS{idVendor}=="0bdb", ATTRS{idProduct}=="1900", ATTRS{bInterfaceNumber}=="09", ENV{ID_MM_ERICSSON_MBM_GPS_PORT}="1"
@@ -69,6 +75,13 @@ ATTRS{idVendor}=="0bdb", ATTRS{idProduct}=="1928", ENV{ID_MM_ERICSSON_MBM}="1"
 # Ericsson C5621 TFF
 ATTRS{idVendor}=="0bdb", ATTRS{idProduct}=="1936", ENV{ID_MM_ERICSSON_MBM}="1"
 
+# Lenovo N5321gw
+ATTRS{idVendor}=="0bdb", ATTRS{idProduct}=="193e", ENV{ID_MM_ERICSSON_MBM}="1"
+
+GOTO="mm_mbm_end"
+
+LABEL="mm_mbm_sony_vendorcheck"
+
 # Sony-Ericsson MD300
 ATTRS{idVendor}=="0fce", ATTRS{idProduct}=="d0cf", ENV{ID_MM_ERICSSON_MBM}="1"
 
@@ -78,6 +91,10 @@ ATTRS{idVendor}=="0fce", ATTRS{idProduct}=="d0e1", ENV{ID_MM_ERICSSON_MBM}="1"
 # Sony-Ericsson MD400G
 ATTRS{idVendor}=="0fce", ATTRS{idProduct}=="d103", ENV{ID_MM_ERICSSON_MBM}="1"
 
+GOTO="mm_mbm_end"
+
+LABEL="mm_mbm_dell_vendorcheck"
+
 # Dell 5560
 ATTRS{idVendor}=="413c", ATTRS{idProduct}=="818e", ENV{ID_MM_ERICSSON_MBM}="1"
 
@@ -100,6 +117,10 @@ ATTRS{idVendor}=="413c", ATTRS{idProduct}=="818b", ENV{ID_MM_ERICSSON_MBM}="1"
 ATTRS{idVendor}=="413c", ATTRS{idProduct}=="818c", ATTRS{bInterfaceNumber}=="09", ENV{ID_MM_ERICSSON_MBM_GPS_PORT}="1"
 ATTRS{idVendor}=="413c", ATTRS{idProduct}=="818c", ENV{ID_MM_ERICSSON_MBM}="1"
 
+GOTO="mm_mbm_end"
+
+LABEL="mm_mbm_hp_vendorcheck"
+
 # HP hs2330 Mobile Broadband Module
 ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="271d", ENV{ID_MM_ERICSSON_MBM}="1"
 
@@ -119,6 +140,10 @@ ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="301d", ENV{ID_MM_ERICSSON_MBM}="1"
 # HP lc2010 Mobile Broadband Module
 ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="2f1d", ENV{ID_MM_ERICSSON_MBM}="1"
 
+GOTO="mm_mbm_end"
+
+LABEL="mm_mbm_toshiba_vendorcheck"
+
 # Toshiba
 ATTRS{idVendor}=="0930", ATTRS{idProduct}=="130b", ATTRS{bInterfaceNumber}=="09", ENV{ID_MM_ERICSSON_MBM_GPS_PORT}="1"
 ATTRS{idVendor}=="0930", ATTRS{idProduct}=="130b", ENV{ID_MM_ERICSSON_MBM}="1"
@@ -141,7 +166,6 @@ ATTRS{idVendor}=="0930", ATTRS{idProduct}=="1314", ENV{ID_MM_ERICSSON_MBM}="1"
 # Toshiba H5321gw
 ATTRS{idVendor}=="0930", ATTRS{idProduct}=="1319", ENV{ID_MM_ERICSSON_MBM}="1"
 
-# Lenovo N5321gw
-ATTRS{idVendor}=="0bdb", ATTRS{idProduct}=="193e", ENV{ID_MM_ERICSSON_MBM}="1"
+GOTO="mm_mbm_end"
 
 LABEL="mm_mbm_end"
-- 
2.9.0