[PATCH v2 1/3] cdc_ether: allow vendor specific data interface if control interface is vendor specific
From: Bjørn Mork <hidden>
Date: 2012-01-15 06:40:35
Subsystem:
networking drivers, the rest, usb cdc ethernet driver, usb networking drivers · Maintainers:
Andrew Lunn, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Linus Torvalds, Oliver Neukum
Some vendors, like Huawei, use the vendor specific class code all over the place even for devices which otherwise conform pretty well to the CDC ECM specification. This allows such devices to be supported merely by adding them to the device specific whitelist. Signed-off-by: Bjørn Mork <redacted> --- Changes from v1: Removed an unintentional debug message change. Thanks to Joe Perches for pointing that out drivers/net/usb/cdc_ether.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/drivers/net/usb/cdc_ether.c b/drivers/net/usb/cdc_ether.c
index 41a61ef..a14a4a3 100644
--- a/drivers/net/usb/cdc_ether.c
+++ b/drivers/net/usb/cdc_ether.c@@ -211,7 +211,11 @@ int usbnet_generic_cdc_bind(struct usbnet *dev, struct usb_interface *intf) /* a data interface altsetting does the real i/o */ d = &info->data->cur_altsetting->desc; - if (d->bInterfaceClass != USB_CLASS_CDC_DATA) { + if ((d->bInterfaceClass != USB_CLASS_CDC_DATA) && + /* Allow vendor specific data interface iff + control interface is vendor specific */ + !(info->control->cur_altsetting->desc.bInterfaceClass == USB_CLASS_VENDOR_SPEC && + d->bInterfaceClass == USB_CLASS_VENDOR_SPEC)) { dev_dbg(&intf->dev, "slave class %u\n", d->bInterfaceClass); goto bad_desc;
--
1.7.7.3
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html