- Fix compilation after r285909 with USB_DEBUG defined.

- Regenerate usb.conf.

diff --git a/etc/devd/usb.conf b/etc/devd/usb.conf
index 3c3cd345a0463bc8fd91aaaefa7a887481940a10..4f1d92f80695c4814c8715b1d0355f805d89761b 100644 (file)
--- a/etc/devd/usb.conf
+++ b/etc/devd/usb.conf
@@ -5433,6 +5433,15 @@ nomatch 32 {
        action "kldload -n umodem";
 };
 
+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";
@@ -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 4adff488446e2ce5146d9e22bfc1b37c38d8e9b1..3c24dcf1d4d75c01f990a6a8abeb222c375321ca 100644 (file)
--- 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);