iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cdc-ncm: use common parser

Browse Source 
This moves cdc-ncm to the common parser for CDC user
to reduce code duplication.

Signed-off-by: Oliver Neukum <oneukum@suse.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Oliver Neukum 2015-09-07 16:05:39 +02:00 committed by David S. Miller
parent c40a2c8817
commit 77b0a09967
1 changed files with 8 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
drivers/net/usb/cdc_ncm.c
View File

@ -698,6 +698,7 @@ int cdc_ncm_bind_common(struct usbnet *dev, struct usb_interface *intf, u8 data_
int len; int len;
int temp; int temp;
u8 iface_no; u8 iface_no;
struct usb_cdc_parsed_header hdr;
ctx = kzalloc(sizeof(*ctx), GFP_KERNEL); ctx = kzalloc(sizeof(*ctx), GFP_KERNEL);
if (!ctx) if (!ctx)
@ -722,66 +723,14 @@ int cdc_ncm_bind_common(struct usbnet *dev, struct usb_interface *intf, u8 data_
len = intf->cur_altsetting->extralen; len = intf->cur_altsetting->extralen;
/* parse through descriptors associated with control interface */ /* parse through descriptors associated with control interface */
while ((len > 0) && (buf[0] > 2) && (buf[0] <= len)) { cdc_parse_cdc_header(&hdr, intf, buf, len);
if (buf[1] != USB_DT_CS_INTERFACE) ctx->data = usb_ifnum_to_if(dev->udev,
goto advance; hdr.usb_cdc_union_desc->bSlaveInterface0);
ctx->ether_desc = hdr.usb_cdc_ether_desc;
switch (buf[2]) { ctx->func_desc = hdr.usb_cdc_ncm_desc;
case USB_CDC_UNION_TYPE: ctx->mbim_desc = hdr.usb_cdc_mbim_desc;
if (buf[0] < sizeof(*union_desc)) ctx->mbim_extended_desc = hdr.usb_cdc_mbim_extended_desc;
break;
union_desc = (const struct usb_cdc_union_desc *)buf;
/* the master must be the interface we are probing */
if (intf->cur_altsetting->desc.bInterfaceNumber !=
union_desc->bMasterInterface0) {
dev_dbg(&intf->dev, "bogus CDC Union\n");
goto error;
}
ctx->data = usb_ifnum_to_if(dev->udev,
union_desc->bSlaveInterface0);
break;
case USB_CDC_ETHERNET_TYPE:
if (buf[0] < sizeof(*(ctx->ether_desc)))
break;
ctx->ether_desc =
(const struct usb_cdc_ether_desc *)buf;
break;
case USB_CDC_NCM_TYPE:
if (buf[0] < sizeof(*(ctx->func_desc)))
break;
ctx->func_desc = (const struct usb_cdc_ncm_desc *)buf;
break;
case USB_CDC_MBIM_TYPE:
if (buf[0] < sizeof(*(ctx->mbim_desc)))
break;
ctx->mbim_desc = (const struct usb_cdc_mbim_desc *)buf;
break;
case USB_CDC_MBIM_EXTENDED_TYPE:
if (buf[0] < sizeof(*(ctx->mbim_extended_desc)))
break;
ctx->mbim_extended_desc =
(const struct usb_cdc_mbim_extended_desc *)buf;
break;
default:
break;
}
advance:
/* advance to next descriptor */
temp = buf[0];
buf += temp;
len -= temp;
}
/* some buggy devices have an IAD but no CDC Union */ /* some buggy devices have an IAD but no CDC Union */
if (!union_desc && intf->intf_assoc && intf->intf_assoc->bInterfaceCount == 2) { if (!union_desc && intf->intf_assoc && intf->intf_assoc->bInterfaceCount == 2) {