Merge remote-tracking branch 'arm-soc/for-next'

[karo-tx-linux.git] / drivers / net / usb / qmi_wwan.c

diff --git a/drivers/net/usb/qmi_wwan.c b/drivers/net/usb/qmi_wwan.c
index 355842b85ee906a434477b325f32199ec315eae8..c54719984c4bdd0da0e36dd54ab1430708483b0b 100644 (file)
--- a/drivers/net/usb/qmi_wwan.c
+++ b/drivers/net/usb/qmi_wwan.c
@@ -229,11 +229,11 @@ static int qmi_wwan_bind(struct usbnet *dev, struct usb_interface *intf)
        u8 *buf = intf->cur_altsetting->extra;
        int len = intf->cur_altsetting->extralen;
        struct usb_interface_descriptor *desc = &intf->cur_altsetting->desc;
-       struct usb_cdc_union_desc *cdc_union = NULL;
-       struct usb_cdc_ether_desc *cdc_ether = NULL;
-       u32 found = 0;
+       struct usb_cdc_union_desc *cdc_union;
+       struct usb_cdc_ether_desc *cdc_ether;
        struct usb_driver *driver = driver_of(intf);
        struct qmi_wwan_state *info = (void *)&dev->data;
+       struct usb_cdc_parsed_header hdr;
 
        BUILD_BUG_ON((sizeof(((struct usbnet *)0)->data) <
                      sizeof(struct qmi_wwan_state)));
@@ -243,63 +243,9 @@ static int qmi_wwan_bind(struct usbnet *dev, struct usb_interface *intf)
        info->data = intf;
 
        /* and a number of CDC descriptors */
-       while (len > 3) {
-               struct usb_descriptor_header *h = (void *)buf;
-
-               /* ignore any misplaced descriptors */
-               if (h->bDescriptorType != USB_DT_CS_INTERFACE)
-                       goto next_desc;
-
-               /* buf[2] is CDC descriptor subtype */
-               switch (buf[2]) {
-               case USB_CDC_HEADER_TYPE:
-                       if (found & 1 << USB_CDC_HEADER_TYPE) {
-                               dev_dbg(&intf->dev, "extra CDC header\n");
-                               goto err;
-                       }
-                       if (h->bLength != sizeof(struct usb_cdc_header_desc)) {
-                               dev_dbg(&intf->dev, "CDC header len %u\n",
-                                       h->bLength);
-                               goto err;
-                       }
-                       break;
-               case USB_CDC_UNION_TYPE:
-                       if (found & 1 << USB_CDC_UNION_TYPE) {
-                               dev_dbg(&intf->dev, "extra CDC union\n");
-                               goto err;
-                       }
-                       if (h->bLength != sizeof(struct usb_cdc_union_desc)) {
-                               dev_dbg(&intf->dev, "CDC union len %u\n",
-                                       h->bLength);
-                               goto err;
-                       }
-                       cdc_union = (struct usb_cdc_union_desc *)buf;
-                       break;
-               case USB_CDC_ETHERNET_TYPE:
-                       if (found & 1 << USB_CDC_ETHERNET_TYPE) {
-                               dev_dbg(&intf->dev, "extra CDC ether\n");
-                               goto err;
-                       }
-                       if (h->bLength != sizeof(struct usb_cdc_ether_desc)) {
-                               dev_dbg(&intf->dev, "CDC ether len %u\n",
-                                       h->bLength);
-                               goto err;
-                       }
-                       cdc_ether = (struct usb_cdc_ether_desc *)buf;
-                       break;
-               }
-
-               /* Remember which CDC functional descriptors we've seen.  Works
-                * for all types we care about, of which USB_CDC_ETHERNET_TYPE
-                * (0x0f) is the highest numbered
-                */
-               if (buf[2] < 32)
-                       found |= 1 << buf[2];
-
-next_desc:
-               len -= h->bLength;
-               buf += h->bLength;
-       }
+       cdc_parse_cdc_header(&hdr, intf, buf, len);
+       cdc_union = hdr.usb_cdc_union_desc;
+       cdc_ether = hdr.usb_cdc_ether_desc;
 
        /* Use separate control and data interfaces if we found a CDC Union */
        if (cdc_union) {
@@ -539,6 +485,10 @@ static const struct usb_device_id products[] = {
                                              USB_CDC_PROTO_NONE),
                .driver_info        = (unsigned long)&qmi_wwan_info,
        },
+       {       /* HP lt4112 LTE/HSPA+ Gobi 4G Module (Huawei me906e) */
+               USB_DEVICE_AND_INTERFACE_INFO(0x03f0, 0x581d, USB_CLASS_VENDOR_SPEC, 1, 7),
+               .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 */
@@ -765,6 +715,10 @@ static const struct usb_device_id products[] = {
        {QMI_FIXED_INTF(0x1199, 0x9056, 8)},    /* Sierra Wireless Modem */
        {QMI_FIXED_INTF(0x1199, 0x9057, 8)},
        {QMI_FIXED_INTF(0x1199, 0x9061, 8)},    /* Sierra Wireless Modem */
+       {QMI_FIXED_INTF(0x1199, 0x9070, 8)},    /* Sierra Wireless MC74xx/EM74xx */
+       {QMI_FIXED_INTF(0x1199, 0x9070, 10)},   /* Sierra Wireless MC74xx/EM74xx */
+       {QMI_FIXED_INTF(0x1199, 0x9071, 8)},    /* Sierra Wireless MC74xx/EM74xx */
+       {QMI_FIXED_INTF(0x1199, 0x9071, 10)},   /* Sierra Wireless MC74xx/EM74xx */
        {QMI_FIXED_INTF(0x1bbb, 0x011e, 4)},    /* Telekom Speedstick LTE II (Alcatel One Touch L100V LTE) */
        {QMI_FIXED_INTF(0x1bbb, 0x0203, 2)},    /* Alcatel L800MA */
        {QMI_FIXED_INTF(0x2357, 0x0201, 4)},    /* TP-LINK HSUPA Modem MA180 */
@@ -787,7 +741,6 @@ static const struct usb_device_id products[] = {
        {QMI_FIXED_INTF(0x413c, 0x81a9, 8)},    /* Dell Wireless 5808e Gobi(TM) 4G LTE Mobile Broadband Card */
        {QMI_FIXED_INTF(0x413c, 0x81b1, 8)},    /* Dell Wireless 5809e Gobi(TM) 4G LTE Mobile Broadband Card */
        {QMI_FIXED_INTF(0x03f0, 0x4e1d, 8)},    /* HP lt4111 LTE/EV-DO/HSPA+ Gobi 4G Module */
-       {QMI_FIXED_INTF(0x03f0, 0x581d, 4)},    /* HP lt4112 LTE/HSPA+ Gobi 4G Module (Huawei me906e) */
 
        /* 4. Gobi 1000 devices */
        {QMI_GOBI1K_DEVICE(0x05c6, 0x9212)},    /* Acer Gobi Modem Device */