From david-b@pacbell.net Sun Apr 29 11:48:23 2007 From: David Brownell Date: Sun, 29 Apr 2007 10:09:47 -0700 Subject: USB: handle more rndis_host oddities To: Greg KH Cc: linux-usb-devel@lists.sourceforge.net Message-ID: <200704291009.48162.david-b@pacbell.net> Content-Disposition: inline Workaround another device firmware bug, wherein CDC descriptors get placed in a wrong place never previously observed in the wild. Fix a bug where a seeming RNDIS device returns a bogus response during device initialization. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman --- drivers/usb/net/cdc_ether.c | 16 ++++++++++++++++ drivers/usb/net/rndis_host.c | 1 + 2 files changed, 17 insertions(+) --- a/drivers/usb/net/cdc_ether.c +++ b/drivers/usb/net/cdc_ether.c @@ -91,6 +91,22 @@ int usbnet_generic_cdc_bind(struct usbne "CDC descriptors on config\n"); } + /* Maybe CDC descriptors are after the endpoint? This bug has + * been seen on some 2Wire Inc RNDIS-ish products. + */ + if (len == 0) { + struct usb_host_endpoint *hep; + + hep = intf->cur_altsetting->endpoint; + if (hep) { + buf = hep->extra; + len = hep->extralen; + } + if (len) + dev_dbg(&intf->dev, + "CDC descriptors on endpoint\n"); + } + /* this assumes that if there's a non-RNDIS vendor variant * of cdc-acm, it'll fail RNDIS requests cleanly. */ --- a/drivers/usb/net/rndis_host.c +++ b/drivers/usb/net/rndis_host.c @@ -515,6 +515,7 @@ static int rndis_bind(struct usbnet *dev dev_err(&intf->dev, "dev can't take %u byte packets (max %u)\n", dev->hard_mtu, tmp); + retval = -EINVAL; goto fail_and_release; }