Author: marius
Date: Mon Jul 27 14:43:14 2015
New Revision: 285913
URL: https://svnweb.freebsd.org/changeset/base/285913
Log:
- Fix compilation after r285909 with USB_DEBUG defined.
- Regenerate usb.conf.
Modified:
head/etc/devd/usb.conf
head/sys/dev/usb/net/if_urndis.c
Modified: head/etc/devd/usb.conf
==============================================================================
--- head/etc/devd/usb.conf Mon Jul 27 14:34:32 2015 (r285912)
+++ head/etc/devd/usb.conf Mon Jul 27 14:43:14 2015 (r285913)
@@ -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
Modified: head/sys/dev/usb/net/if_urndis.c
==============================================================================
--- head/sys/dev/usb/net/if_urndis.c Mon Jul 27 14:34:32 2015
(r285912)
+++ head/sys/dev/usb/net/if_urndis.c Mon Jul 27 14:43:14 2015
(r285913)
@@ -735,13 +735,13 @@ urndis_ctrl_query(struct urndis_softc *s
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);
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
