lkml.org 
[lkml]   [2013]   [May]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 21/78] qmi_wwan, cdc-ether: add ADU960S
    Date
    3.8.13.1 -stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Dan Williams <dcbw@redhat.com>

    commit 45d213f5f8733ab4b5b2424b21c0034d54c5a866 upstream.

    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>
    [ kamal: selected for 3.8 stable ]
    Signed-off-by: Kamal Mostafa <kamal@canonical.com>
    ---
    drivers/net/usb/cdc_ether.c | 7 +++++++
    drivers/net/usb/qmi_wwan.c | 7 +++++++
    2 files changed, 14 insertions(+)

    diff --git a/drivers/net/usb/cdc_ether.c b/drivers/net/usb/cdc_ether.c
    index 3f3d12d..57136dc 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 [] = {
    .driver_info = 0,
    },

    +/* AnyDATA ADU960S - handled by qmi_wwan */
    +{
    + USB_DEVICE_AND_INTERFACE_INFO(0x16d5, 0x650a, USB_CLASS_COMM,
    + USB_CDC_SUBCLASS_ETHERNET, USB_CDC_PROTO_NONE),
    + .driver_info = 0,
    +},
    +
    /*
    * WHITELIST!!!
    *
    diff --git a/drivers/net/usb/qmi_wwan.c b/drivers/net/usb/qmi_wwan.c
    index b69ca0f..968d5d5 100644
    --- a/drivers/net/usb/qmi_wwan.c
    +++ b/drivers/net/usb/qmi_wwan.c
    @@ -392,6 +392,13 @@ static const struct usb_device_id products[] = {
    USB_CDC_PROTO_NONE),
    .driver_info = (unsigned long)&qmi_wwan_info,
    },
    + { /* ADU960S */
    + USB_DEVICE_AND_INTERFACE_INFO(0x16d5, 0x650a,
    + 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(0x0408, 0xea42, 4)}, /* Yota / Megafon M100-1 */
    --
    1.8.1.2


    \
     
     \ /
      Last update: 2013-05-29 00:01    [W:4.123 / U:1.384 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site