lkml.org 
[lkml]   [2013]   [May]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 070/115] qmi_wwan/cdc_ether: add device IDs for Dell 5804 (Novatel E371) WWAN card
    Date
    3.5.7.13 -stable review patch.  If anyone has any objections, please let me know.

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

    From: Dan Williams <dcbw@redhat.com>

    commit 7fdb7846c9ca6fc06e380de0976a1228703b498a upstream.

    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.

    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>
    [ luis: adjust context ]
    Signed-off-by: Luis Henriques <luis.henriques@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 c4c593d..e7d4238 100644
    --- a/drivers/net/usb/cdc_ether.c
    +++ b/drivers/net/usb/cdc_ether.c
    @@ -633,6 +633,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,
    +},
    +
    /*
    * WHITELIST!!!
    *
    diff --git a/drivers/net/usb/qmi_wwan.c b/drivers/net/usb/qmi_wwan.c
    index e064b1d..9bb0006 100644
    --- a/drivers/net/usb/qmi_wwan.c
    +++ b/drivers/net/usb/qmi_wwan.c
    @@ -607,6 +607,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,
    + },

    /* Gobi 1000 devices */
    {QMI_GOBI1K_DEVICE(0x05c6, 0x9212)}, /* Acer Gobi Modem Device */
    --
    1.8.1.2
    --
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

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