diff options
| author | Dan Williams <dcbw@redhat.com> | 2013-05-06 11:17:37 +0000 | 
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-05-08 12:08:14 -0700 | 
| commit | 7fdb7846c9ca6fc06e380de0976a1228703b498a (patch) | |
| tree | 55e685bdb8d1eecc1e820e05ba3ec9b10c1bcc25 | |
| parent | fba8755911841f9c1d49792ebce32448446e4ce2 (diff) | |
| download | olio-linux-3.10-7fdb7846c9ca6fc06e380de0976a1228703b498a.tar.xz olio-linux-3.10-7fdb7846c9ca6fc06e380de0976a1228703b498a.zip  | |
qmi_wwan/cdc_ether: add device IDs for Dell 5804 (Novatel E371) WWAN card
A rebranded Novatel E371 for AT&T's LTE bands.  qmi_wwan should drive this
device, while cdc_ether should ignore it.  Even though the USB descriptors
are plain CDC-ETHER that USB interface is a QMI interface.
Cc: <stable@vger.kernel.org>
Signed-off-by: Dan Williams <dcbw@redhat.com>
Acked-by: Bjørn Mork <bjorn@mork.no>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/usb/cdc_ether.c | 7 | ||||
| -rw-r--r-- | drivers/net/usb/qmi_wwan.c | 7 | 
2 files changed, 14 insertions, 0 deletions
diff --git a/drivers/net/usb/cdc_ether.c b/drivers/net/usb/cdc_ether.c index 24fbec27a22..078795fe6e3 100644 --- a/drivers/net/usb/cdc_ether.c +++ b/drivers/net/usb/cdc_ether.c @@ -613,6 +613,13 @@ static const struct usb_device_id	products [] = {  	.driver_info = 0,  }, +/* Dell Wireless 5804 (Novatel E371) - handled by qmi_wwan */ +{ +	USB_DEVICE_AND_INTERFACE_INFO(DELL_VENDOR_ID, 0x819b, USB_CLASS_COMM, +			USB_CDC_SUBCLASS_ETHERNET, USB_CDC_PROTO_NONE), +	.driver_info = 0, +}, +  /* AnyDATA ADU960S - handled by qmi_wwan */  {  	USB_DEVICE_AND_INTERFACE_INFO(0x16d5, 0x650a, USB_CLASS_COMM, diff --git a/drivers/net/usb/qmi_wwan.c b/drivers/net/usb/qmi_wwan.c index 834e405fb57..cf887c2384e 100644 --- a/drivers/net/usb/qmi_wwan.c +++ b/drivers/net/usb/qmi_wwan.c @@ -501,6 +501,13 @@ static const struct usb_device_id products[] = {  					      USB_CDC_PROTO_NONE),  		.driver_info        = (unsigned long)&qmi_wwan_info,  	}, +	{	/* Dell Wireless 5804 (Novatel E371) */ +		USB_DEVICE_AND_INTERFACE_INFO(0x413C, 0x819b, +					      USB_CLASS_COMM, +					      USB_CDC_SUBCLASS_ETHERNET, +					      USB_CDC_PROTO_NONE), +		.driver_info        = (unsigned long)&qmi_wwan_info, +	},  	{	/* ADU960S */  		USB_DEVICE_AND_INTERFACE_INFO(0x16d5, 0x650a,  					      USB_CLASS_COMM,  |