Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Minor overlapping changes in the btusb and ixgbe drivers.

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 9 insertions, 1 deletions

diff --git a/drivers/net/usb/cdc_ether.c b/drivers/net/usb/cdc_ether.c
index 8458e88c18e9..32f53de5b1fe 100644
--- a/drivers/net/usb/cdc_ether.c
+++ b/drivers/net/usb/cdc_ether.c
@@ -206,7 +206,15 @@ int usbnet_generic_cdc_bind(struct usbnet *dev, struct usb_interface *intf)
                 goto bad_desc;
         }
 skip:
-        if (rndis && header.usb_cdc_acm_descriptor &&
+        /* Communcation class functions with bmCapabilities are not
+         * RNDIS.  But some Wireless class RNDIS functions use
+         * bmCapabilities for their own purpose. The failsafe is
+         * therefore applied only to Communication class RNDIS
+         * functions.  The rndis test is redundant, but a cheap
+         * optimization.
+         */
+        if (rndis && is_rndis(&intf->cur_altsetting->desc) &&
+            header.usb_cdc_acm_descriptor &&
             header.usb_cdc_acm_descriptor->bmCapabilities) {
                 dev_dbg(&intf->dev,
                         "ACM capabilities %02x, not really RNDIS?\n",