diff --git a/etc/devd/usb.conf b/etc/devd/usb.conf
index 3c3cd345a046..4f1d92f80695 100644
--- 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 4adff488446e..3c24dcf1d4d7 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);