mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-24 11:29:10 +00:00
Code Issues Releases Activity

Resolve USB driver identification conflict.

Browse Source 
Reported by:	Anish Mistry <amistry@am-productions.biz>
MFC after:	1 week
This commit is contained in:
Hans Petter Selasky 2014-12-15 09:23:40 +00:00
parent 7728b3d28c
commit 3d9b56b045
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=275790
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sys/dev/usb/net/if_urndis.c
View File

@ -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

2
sys/dev/usb/serial/umodem.c
View File

@ -125,7 +125,7 @@ static const STRUCT_USB_HOST_ID umodem_devs[] = {
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 */