X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=rules%2F75-net-description.rules;h=fe9fca14db5e6d5af11da40bfe3a9934ea359e2b;hb=b7f247e0befb6595049bc2410fe370e21d1f7444;hp=4437a34edaa085a6bf96440feb524b5295d8a46e;hpb=796b06c21b62d13c9021e2fbd9c58a5c6edb2764;p=elogind.git

diff --git a/rules/75-net-description.rules b/rules/75-net-description.rules
index 4437a34ed..fe9fca14d 100644
--- a/rules/75-net-description.rules
+++ b/rules/75-net-description.rules
@@ -3,12 +3,12 @@
 ACTION=="remove", GOTO="net_end"
 SUBSYSTEM!="net", GOTO="net_end"
 
-SUBSYSTEMS=="usb", ENV{ID_MODEL}=="", IMPORT{builtin}="usb_id"
-SUBSYSTEMS=="usb", IMPORT{builtin}="hwdb"
-SUBSYSTEMS=="usb", ATTRS{idVendor}!="", ATTRS{idProduct}!="", ENV{ID_VENDOR_ID}="$attr{idVendor}", ENV{ID_MODEL_ID}="$attr{idProduct}"
+IMPORT{builtin}="net_id"
+SUBSYSTEMS=="usb", IMPORT{builtin}="usb_id", IMPORT{builtin}="hwdb --subsystem=usb"
 SUBSYSTEMS=="usb", GOTO="net_end"
 
-IMPORT{builtin}="hwdb"
 SUBSYSTEMS=="pci", ENV{ID_BUS}="pci", ENV{ID_VENDOR_ID}="$attr{vendor}", ENV{ID_MODEL_ID}="$attr{device}"
 
+IMPORT{builtin}="hwdb"
+
 LABEL="net_end"