Re: [PATCH 02/14] [cdc_ether] Hardwire CDC descriptors when missing
From: David Brownell <hidden>
Date: 2008-01-25 01:20:19
Also in:
linux-wireless
On Saturday 19 January 2008, Jussi Kivilinna wrote:
From: Bjorge Dijkstra <redacted> Just as ActiveSync devices, some regular RNDIS devices also lack the CDC descriptors (e.g. devices based on BCM4320 WLAN chip). This patch hardwires the CDC descriptors for all RNDIS style devices when they are missing. Signed-off-by: Bjorge Dijkstra <redacted> Signed-off-by: Jussi Kivilinna <redacted>
Acked-by: David Brownell <redacted>
quoted hunk ↗ jump to hunk
--- drivers/net/usb/cdc_ether.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-)diff --git a/drivers/net/usb/cdc_ether.c b/drivers/net/usb/cdc_ether.c index a42acc3..97c17bb 100644 --- a/drivers/net/usb/cdc_ether.c +++ b/drivers/net/usb/cdc_ether.c@@ -228,15 +228,16 @@ next_desc: buf += buf [0]; } - /* Microsoft ActiveSync based RNDIS devices lack the CDC descriptors, - * so we'll hard-wire the interfaces and not check for descriptors. + /* Microsoft ActiveSync based and some regular RNDIS devices lack the + * CDC descriptors, so we'll hard-wire the interfaces and not check + * for descriptors. */ - if (is_activesync(&intf->cur_altsetting->desc) && !info->u) { + if (rndis && !info->u) { info->control = usb_ifnum_to_if(dev->udev, 0); info->data = usb_ifnum_to_if(dev->udev, 1); if (!info->control || !info->data) { dev_dbg(&intf->dev, - "activesync: master #0/%p slave #1/%p\n", + "rndis: master #0/%p slave #1/%p\n", info->control, info->data); goto bad_desc;@@ -316,7 +317,6 @@ void usbnet_cdc_unbind(struct usbnet *dev, struct usb_interface *intf) } EXPORT_SYMBOL_GPL(usbnet_cdc_unbind); -
/*------------------------------------------------------------------------- * * Communications Device Class, Ethernet Control model