aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Williams <dcbw@redhat.com>2013-02-18 12:25:09 -0500
committerDavid S. Miller <davem@davemloft.net>2013-02-19 00:51:10 -0500
commit45d213f5f8733ab4b5b2424b21c0034d54c5a866 (patch)
treed3c400a6a2116458fc163fa25d371c2312aed33e
parentb3f92b63c4c793142751d029ae0037fb8ab403a0 (diff)
qmi_wwan, cdc-ether: add ADU960S
It advertises a standard CDC-ETHER interface, which actually should be driven by qmi_wwan. Signed-off-by: Dan Williams <dcbw@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/usb/cdc_ether.c7
-rw-r--r--drivers/net/usb/qmi_wwan.c7
2 files changed, 14 insertions, 0 deletions
diff --git a/drivers/net/usb/cdc_ether.c b/drivers/net/usb/cdc_ether.c
index 3f3d12d766e7..57136dc1b887 100644
--- a/drivers/net/usb/cdc_ether.c
+++ b/drivers/net/usb/cdc_ether.c
@@ -615,6 +615,13 @@ static const struct usb_device_id products [] = {
615 .driver_info = 0, 615 .driver_info = 0,
616}, 616},
617 617
618/* AnyDATA ADU960S - handled by qmi_wwan */
619{
620 USB_DEVICE_AND_INTERFACE_INFO(0x16d5, 0x650a, USB_CLASS_COMM,
621 USB_CDC_SUBCLASS_ETHERNET, USB_CDC_PROTO_NONE),
622 .driver_info = 0,
623},
624
618/* 625/*
619 * WHITELIST!!! 626 * WHITELIST!!!
620 * 627 *
diff --git a/drivers/net/usb/qmi_wwan.c b/drivers/net/usb/qmi_wwan.c
index 19d903598b0d..efb5c7c33a28 100644
--- a/drivers/net/usb/qmi_wwan.c
+++ b/drivers/net/usb/qmi_wwan.c
@@ -409,6 +409,13 @@ static const struct usb_device_id products[] = {
409 USB_CDC_PROTO_NONE), 409 USB_CDC_PROTO_NONE),
410 .driver_info = (unsigned long)&qmi_wwan_info, 410 .driver_info = (unsigned long)&qmi_wwan_info,
411 }, 411 },
412 { /* ADU960S */
413 USB_DEVICE_AND_INTERFACE_INFO(0x16d5, 0x650a,
414 USB_CLASS_COMM,
415 USB_CDC_SUBCLASS_ETHERNET,
416 USB_CDC_PROTO_NONE),
417 .driver_info = (unsigned long)&qmi_wwan_info,
418 },
412 419
413 /* 3. Combined interface devices matching on interface number */ 420 /* 3. Combined interface devices matching on interface number */
414 {QMI_FIXED_INTF(0x0408, 0xea42, 4)}, /* Yota / Megafon M100-1 */ 421 {QMI_FIXED_INTF(0x0408, 0xea42, 4)}, /* Yota / Megafon M100-1 */