Author: hselasky
Date: Thu Feb 6 10:47:47 2014
New Revision: 261544
URL: http://svnweb.freebsd.org/changeset/base/261544
Log:
Resolve probe conflict for now.
MFC after: 2 weeks
Modified:
head/sys/dev/usb/net/if_urndis.c
Modified: head/sys/dev/usb/net/if_urndis.c
==============================================================================
--- head/sys/dev/usb/net/if_urndis.c Thu Feb 6 10:38:40 2014
(r261543)
+++ head/sys/dev/usb/net/if_urndis.c Thu Feb 6 10:47:47 2014
(r261544)
@@ -170,8 +170,11 @@ static const struct usb_ether_methods ur
};
static const STRUCT_USB_HOST_ID urndis_host_devs[] = {
+#if 0
+ /* XXX this entry has a conflict an entry the umodem driver XXX */
{USB_IFACE_CLASS(UICLASS_CDC),
USB_IFACE_SUBCLASS(UISUBCLASS_ABSTRACT_CONTROL_MODEL),
USB_IFACE_PROTOCOL(0xff)},
+#endif
{USB_IFACE_CLASS(UICLASS_WIRELESS), USB_IFACE_SUBCLASS(UISUBCLASS_RF),
USB_IFACE_PROTOCOL(UIPROTO_RNDIS)},
{USB_IFACE_CLASS(UICLASS_IAD), USB_IFACE_SUBCLASS(UISUBCLASS_SYNC),
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
