summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--etc/devd/usb.conf11
-rw-r--r--sys/dev/usb/net/if_urndis.c14
2 files changed, 17 insertions, 8 deletions
diff --git a/etc/devd/usb.conf b/etc/devd/usb.conf
index 3c3cd34..4f1d92f 100644
--- a/etc/devd/usb.conf
+++ b/etc/devd/usb.conf
@@ -5436,6 +5436,15 @@ nomatch 32 {
nomatch 32 {
match "bus" "uhub[0-9]+";
match "mode" "host";
+ match "intclass" "0x02";
+ match "intsubclass" "0x02";
+ match "intprotocol" "0xff";
+ action "kldload -n if_urndis";
+};
+
+nomatch 32 {
+ match "bus" "uhub[0-9]+";
+ match "mode" "host";
match "intclass" "0x03";
match "intsubclass" "0x01";
match "intprotocol" "0x01";
@@ -5576,5 +5585,5 @@ nomatch 32 {
action "kldload -n umass";
};
-# 2687 USB entries processed
+# 2688 USB entries processed
diff --git a/sys/dev/usb/net/if_urndis.c b/sys/dev/usb/net/if_urndis.c
index 4adff48..3c24dcf 100644
--- a/sys/dev/usb/net/if_urndis.c
+++ b/sys/dev/usb/net/if_urndis.c
@@ -735,13 +735,13 @@ urndis_ctrl_query(struct urndis_softc *sc, uint32_t oid,
DPRINTF("type %u len %u rid %u oid 0x%x "
"infobuflen %u infobufoffset %u devicevchdl %u\n",
- le32toh(msg.rm_type),
- le32toh(msg.rm_len),
- le32toh(msg.rm_rid),
- le32toh(msg.rm_oid),
- le32toh(msg.rm_infobuflen),
- le32toh(msg.rm_infobufoffset),
- le32toh(msg.rm_devicevchdl));
+ le32toh(msg->rm_type),
+ le32toh(msg->rm_len),
+ le32toh(msg->rm_rid),
+ le32toh(msg->rm_oid),
+ le32toh(msg->rm_infobuflen),
+ le32toh(msg->rm_infobufoffset),
+ le32toh(msg->rm_devicevchdl));
rval = urndis_ctrl_send(sc, msg, len);
OpenPOWER on IntegriCloud