---

yaml
---
r: 56825
b: refs/heads/master
c: 4149b72
h: refs/heads/master
i:
  56823: 72813ab
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 47f8468e6008a1d62f7dacbcff4ec3e115a500c8
+refs/heads/master: 4149b72eaa74583c361e3aaf5804eb74b72c51f1

trunk/drivers/net/usb/cdc_ether.c

@@ -91,6 +91,22 @@ int usbnet_generic_cdc_bind(struct usbnet *dev, struct usb_interface *intf)
 				"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.
 	 */

trunk/drivers/net/usb/rndis_host.c

@@ -515,6 +515,7 @@ static int rndis_bind(struct usbnet *dev, struct usb_interface *intf)
 		dev_err(&intf->dev,
 			"dev can't take %u byte packets (max %u)\n",
 			dev->hard_mtu, tmp);
+		retval = -EINVAL;
 		goto fail_and_release;
 	}