rndis_host: support WM6 devices as modems

[mv-sheeva.git] / drivers / net / usb / cdc_ether.c

diff --git a/drivers/net/usb/cdc_ether.c b/drivers/net/usb/cdc_ether.c
index a934428a5890ba26adf4df7e00588d57a08ef786..0e061dfea78d15226e65da13e5aa1f764c09bd30 100644 (file)
--- a/drivers/net/usb/cdc_ether.c
+++ b/drivers/net/usb/cdc_ether.c
@@ -50,10 +50,18 @@ static int is_activesync(struct usb_interface_descriptor *desc)
                && desc->bInterfaceProtocol == 1;
 }
 
+static int is_wireless_rndis(struct usb_interface_descriptor *desc)
+{
+       return desc->bInterfaceClass == USB_CLASS_WIRELESS_CONTROLLER
+               && desc->bInterfaceSubClass == 1
+               && desc->bInterfaceProtocol == 3;
+}
+
 #else
 
 #define is_rndis(desc)         0
 #define is_activesync(desc)    0
+#define is_wireless_rndis(desc)        0
 
 #endif
 
@@ -110,7 +118,8 @@ int usbnet_generic_cdc_bind(struct usbnet *dev, struct usb_interface *intf)
         * of cdc-acm, it'll fail RNDIS requests cleanly.
         */
        rndis = is_rndis(&intf->cur_altsetting->desc)
-               || is_activesync(&intf->cur_altsetting->desc);
+               || is_activesync(&intf->cur_altsetting->desc)
+               || is_wireless_rndis(&intf->cur_altsetting->desc);
 
        memset(info, 0, sizeof *info);
        info->control = intf;