Date: Mon, 27 Jul 2015 14:43:15 +0000 (UTC) From: Marius Strobl <marius@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r285913 - in head: etc/devd sys/dev/usb/net Message-ID: <201507271443.t6REhFwg003419@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201507271443.t6REhFwg003419>