aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorDan Williams <dcbw@redhat.com>2012-12-17 03:17:41 -0500
committerDavid S. Miller <davem@davemloft.net>2012-12-17 23:50:51 -0500
commit0370acd4d4d2595a11b0b0a793acb506e19b9d4c (patch)
tree27b15f40b37b5198b4c306ce1d15dbaacfe87a43 /drivers
parent3c4177716cd2e452229dd0b7c25d192c48c1e7ac (diff)
qmi_wwan/cdc_ether: add Dell Wireless 5800 (Novatel E362) USB IDs
Signed-off-by: Dan Williams <dcbw@redhat.com> Cc: stable@vger.kernel.org Acked-by: Bjørn Mork <bjorn@mork.no> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/usb/cdc_ether.c15
-rw-r--r--drivers/net/usb/qmi_wwan.c14
2 files changed, 29 insertions, 0 deletions
diff --git a/drivers/net/usb/cdc_ether.c b/drivers/net/usb/cdc_ether.c
index d0129827602b..c4c593dcf0ba 100644
--- a/drivers/net/usb/cdc_ether.c
+++ b/drivers/net/usb/cdc_ether.c
@@ -487,6 +487,7 @@ static const struct driver_info wwan_info = {
487#define HUAWEI_VENDOR_ID 0x12D1 487#define HUAWEI_VENDOR_ID 0x12D1
488#define NOVATEL_VENDOR_ID 0x1410 488#define NOVATEL_VENDOR_ID 0x1410
489#define ZTE_VENDOR_ID 0x19D2 489#define ZTE_VENDOR_ID 0x19D2
490#define DELL_VENDOR_ID 0x413C
490 491
491static const struct usb_device_id products [] = { 492static const struct usb_device_id products [] = {
492/* 493/*
@@ -618,6 +619,20 @@ static const struct usb_device_id products [] = {
618 .driver_info = 0, 619 .driver_info = 0,
619}, 620},
620 621
622/* Dell Wireless 5800 (Novatel E362) - handled by qmi_wwan */
623{
624 USB_DEVICE_AND_INTERFACE_INFO(DELL_VENDOR_ID, 0x8195, USB_CLASS_COMM,
625 USB_CDC_SUBCLASS_ETHERNET, USB_CDC_PROTO_NONE),
626 .driver_info = 0,
627},
628
629/* Dell Wireless 5800 (Novatel E362) - handled by qmi_wwan */
630{
631 USB_DEVICE_AND_INTERFACE_INFO(DELL_VENDOR_ID, 0x8196, USB_CLASS_COMM,
632 USB_CDC_SUBCLASS_ETHERNET, USB_CDC_PROTO_NONE),
633 .driver_info = 0,
634},
635
621/* 636/*
622 * WHITELIST!!! 637 * WHITELIST!!!
623 * 638 *
diff --git a/drivers/net/usb/qmi_wwan.c b/drivers/net/usb/qmi_wwan.c
index 1ea91f4237f0..9b950f59f68c 100644
--- a/drivers/net/usb/qmi_wwan.c
+++ b/drivers/net/usb/qmi_wwan.c
@@ -383,6 +383,20 @@ static const struct usb_device_id products[] = {
383 USB_CDC_PROTO_NONE), 383 USB_CDC_PROTO_NONE),
384 .driver_info = (unsigned long)&qmi_wwan_info, 384 .driver_info = (unsigned long)&qmi_wwan_info,
385 }, 385 },
386 { /* Dell Wireless 5800 (Novatel E362) */
387 USB_DEVICE_AND_INTERFACE_INFO(0x413C, 0x8195,
388 USB_CLASS_COMM,
389 USB_CDC_SUBCLASS_ETHERNET,
390 USB_CDC_PROTO_NONE),
391 .driver_info = (unsigned long)&qmi_wwan_info,
392 },
393 { /* Dell Wireless 5800 V2 (Novatel E362) */
394 USB_DEVICE_AND_INTERFACE_INFO(0x413C, 0x8196,
395 USB_CLASS_COMM,
396 USB_CDC_SUBCLASS_ETHERNET,
397 USB_CDC_PROTO_NONE),
398 .driver_info = (unsigned long)&qmi_wwan_info,
399 },
386 400
387 /* 3. Combined interface devices matching on interface number */ 401 /* 3. Combined interface devices matching on interface number */
388 {QMI_FIXED_INTF(0x12d1, 0x140c, 1)}, /* Huawei E173 */ 402 {QMI_FIXED_INTF(0x12d1, 0x140c, 1)}, /* Huawei E173 */