svn commit: r275790 - in head/sys/dev/usb: net serial

[Hans Petter Selasky]

Author: hselasky
Date: Mon Dec 15 09:23:40 2014
New Revision: 275790
URL: https://svnweb.freebsd.org/changeset/base/275790

Log:
  Resolve USB driver identification conflict.
  
  Reported by:	Anish Mistry <amistry at am-productions.biz>
  MFC after:	1 week

Modified:
  head/sys/dev/usb/net/if_urndis.c
  head/sys/dev/usb/serial/umodem.c

Modified: head/sys/dev/usb/net/if_urndis.c
==============================================================================
--- head/sys/dev/usb/net/if_urndis.c	Mon Dec 15 08:35:07 2014	(r275789)
+++ head/sys/dev/usb/net/if_urndis.c	Mon Dec 15 09:23:40 2014	(r275790)
@@ -170,15 +170,15 @@ 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
+	/* Generic RNDIS class match */
 	{USB_IFACE_CLASS(UICLASS_WIRELESS), USB_IFACE_SUBCLASS(UISUBCLASS_RF),
-	USB_IFACE_PROTOCOL(UIPROTO_RNDIS)},
+		USB_IFACE_PROTOCOL(UIPROTO_RNDIS)},
 	{USB_IFACE_CLASS(UICLASS_IAD), USB_IFACE_SUBCLASS(UISUBCLASS_SYNC),
-	USB_IFACE_PROTOCOL(UIPROTO_ACTIVESYNC)},
+		USB_IFACE_PROTOCOL(UIPROTO_ACTIVESYNC)},
+	/* HP-WebOS */
+	{USB_VENDOR(USB_VENDOR_PALM), USB_IFACE_CLASS(UICLASS_CDC),
+		USB_IFACE_SUBCLASS(UISUBCLASS_ABSTRACT_CONTROL_MODEL),
+		USB_IFACE_PROTOCOL(0xff)},
 };
 
 static int

Modified: head/sys/dev/usb/serial/umodem.c
==============================================================================
--- head/sys/dev/usb/serial/umodem.c	Mon Dec 15 08:35:07 2014	(r275789)
+++ head/sys/dev/usb/serial/umodem.c	Mon Dec 15 09:23:40 2014	(r275790)
@@ -125,7 +125,7 @@ static const STRUCT_USB_HOST_ID umodem_d
 		USB_IFACE_SUBCLASS(UISUBCLASS_ABSTRACT_CONTROL_MODEL),
 		USB_IFACE_PROTOCOL(UIPROTO_CDC_NONE)},
 	/* Huawei Modem class match */
-	{USB_IFACE_CLASS(UICLASS_CDC),
+	{USB_VENDOR(USB_VENDOR_HUAWEI),USB_IFACE_CLASS(UICLASS_CDC),
 		USB_IFACE_SUBCLASS(UISUBCLASS_ABSTRACT_CONTROL_MODEL),
 		USB_IFACE_PROTOCOL(0xFF)},
 	/* Kyocera AH-K3001V */