| From 0370acd4d4d2595a11b0b0a793acb506e19b9d4c Mon Sep 17 00:00:00 2001 |
| From: Dan Williams <dcbw@redhat.com> |
| Date: Mon, 17 Dec 2012 08:17:41 +0000 |
| Subject: qmi_wwan/cdc_ether: add Dell Wireless 5800 (Novatel E362) USB IDs |
| |
| From: Dan Williams <dcbw@redhat.com> |
| |
| commit 0370acd4d4d2595a11b0b0a793acb506e19b9d4c upstream. |
| |
| 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> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/net/usb/cdc_ether.c | 15 +++++++++++++++ |
| drivers/net/usb/qmi_wwan.c | 14 ++++++++++++++ |
| 2 files changed, 29 insertions(+) |
| |
| --- a/drivers/net/usb/cdc_ether.c |
| +++ b/drivers/net/usb/cdc_ether.c |
| @@ -487,6 +487,7 @@ static const struct driver_info wwan_inf |
| #define HUAWEI_VENDOR_ID 0x12D1 |
| #define NOVATEL_VENDOR_ID 0x1410 |
| #define ZTE_VENDOR_ID 0x19D2 |
| +#define DELL_VENDOR_ID 0x413C |
| |
| static const struct usb_device_id products [] = { |
| /* |
| @@ -618,6 +619,20 @@ static const struct usb_device_id produc |
| .driver_info = 0, |
| }, |
| |
| +/* Dell Wireless 5800 (Novatel E362) - handled by qmi_wwan */ |
| +{ |
| + USB_DEVICE_AND_INTERFACE_INFO(DELL_VENDOR_ID, 0x8195, USB_CLASS_COMM, |
| + USB_CDC_SUBCLASS_ETHERNET, USB_CDC_PROTO_NONE), |
| + .driver_info = 0, |
| +}, |
| + |
| +/* Dell Wireless 5800 (Novatel E362) - handled by qmi_wwan */ |
| +{ |
| + USB_DEVICE_AND_INTERFACE_INFO(DELL_VENDOR_ID, 0x8196, USB_CLASS_COMM, |
| + USB_CDC_SUBCLASS_ETHERNET, USB_CDC_PROTO_NONE), |
| + .driver_info = 0, |
| +}, |
| + |
| /* |
| * WHITELIST!!! |
| * |
| --- a/drivers/net/usb/qmi_wwan.c |
| +++ b/drivers/net/usb/qmi_wwan.c |
| @@ -383,6 +383,20 @@ static const struct usb_device_id produc |
| USB_CDC_PROTO_NONE), |
| .driver_info = (unsigned long)&qmi_wwan_info, |
| }, |
| + { /* Dell Wireless 5800 (Novatel E362) */ |
| + USB_DEVICE_AND_INTERFACE_INFO(0x413C, 0x8195, |
| + USB_CLASS_COMM, |
| + USB_CDC_SUBCLASS_ETHERNET, |
| + USB_CDC_PROTO_NONE), |
| + .driver_info = (unsigned long)&qmi_wwan_info, |
| + }, |
| + { /* Dell Wireless 5800 V2 (Novatel E362) */ |
| + USB_DEVICE_AND_INTERFACE_INFO(0x413C, 0x8196, |
| + USB_CLASS_COMM, |
| + USB_CDC_SUBCLASS_ETHERNET, |
| + USB_CDC_PROTO_NONE), |
| + .driver_info = (unsigned long)&qmi_wwan_info, |
| + }, |
| |
| /* 3. Combined interface devices matching on interface number */ |
| {QMI_FIXED_INTF(0x12d1, 0x140c, 1)}, /* Huawei E173 */ |