diff options
| author | Hans Petter Selasky <hselasky@FreeBSD.org> | 2014-12-15 09:23:40 +0000 |
|---|---|---|
| committer | Hans Petter Selasky <hselasky@FreeBSD.org> | 2014-12-15 09:23:40 +0000 |
| commit | 3d9b56b045b7553fb7ca054248ea6530aa675730 (patch) | |
| tree | 572505ce1adbacd246ab4079284b8077e8866c27 /sys/dev/usb/net/if_urndis.c | |
| parent | 7728b3d28cb44a49cda1e99db6e8e4b5e441b959 (diff) | |
| download | src-3d9b56b045b7553fb7ca054248ea6530aa675730.tar.gz src-3d9b56b045b7553fb7ca054248ea6530aa675730.zip | |
Resolve USB driver identification conflict.
Reported by: Anish Mistry <amistry@am-productions.biz>
MFC after: 1 week
Notes
Notes:
svn path=/head/; revision=275790
Diffstat (limited to 'sys/dev/usb/net/if_urndis.c')
| -rw-r--r-- | sys/dev/usb/net/if_urndis.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sys/dev/usb/net/if_urndis.c b/sys/dev/usb/net/if_urndis.c index 5d45395d46c6..aa88a56148b7 100644 --- a/sys/dev/usb/net/if_urndis.c +++ b/sys/dev/usb/net/if_urndis.c @@ -170,15 +170,15 @@ static const struct usb_ether_methods urndis_ue_methods = { }; 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 |