Revert "Add USB_ANDROID_RNDIS_WCEIS option."

This reverts commit aace891ed58b0081b0207debb517567a499b50ed.

diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig
index 47cc0dbc42486b6c258a8113da0a4e6b7f06f387..f703c762e0e4dfb23ee063e9816cf24388d468d7 100644 (file)
--- a/drivers/usb/gadget/Kconfig
+++ b/drivers/usb/gadget/Kconfig
@@ -825,16 +825,6 @@ config USB_ANDROID_RNDIS
        help
          Provides RNDIS ethernet function for android gadget driver.
 
-config USB_ANDROID_RNDIS_WCEIS
-        boolean "Use Windows Internet Sharing Class/SubClass/Protocol"
-        depends on USB_ANDROID_RNDIS
-        help
-         Causes the driver to look like a Windows-compatible Internet
-         Sharing device, so Windows auto-detects it.
-
-         If you enable this option, the device is no longer CDC ethernet
-         compatible.
-
 config USB_CDC_COMPOSITE
        tristate "CDC Composite Device (Ethernet and ACM)"
        depends on NET

diff --git a/drivers/usb/gadget/android.c b/drivers/usb/gadget/android.c
index e1ea22fe0e612c42d9b835aa220f27e3e39c0e34..77ff19eebbfa67b1574acc9cd20d6d93c762c3bc 100755 (executable)
--- a/drivers/usb/gadget/android.c
+++ b/drivers/usb/gadget/android.c
@@ -336,11 +336,7 @@ void android_enable_function(struct usb_function *f, int enable)
                */
                if (!strcmp(f->name, "rndis")) {
                        if (enable)
-#ifdef CONFIG_USB_ANDROID_RNDIS_WCEIS
-                               dev->cdev->desc.bDeviceClass = USB_CLASS_WIRELESS_CONTROLLER;
-#else
                                dev->cdev->desc.bDeviceClass = USB_CLASS_COMM;
-#endif
                        else
                                dev->cdev->desc.bDeviceClass = USB_CLASS_PER_INTERFACE;
                }

diff --git a/drivers/usb/gadget/f_rndis.c b/drivers/usb/gadget/f_rndis.c
index 21bf50f5bbb83d187bbadd555204dbe42fb0664d..67a923fce6f0aea966f378faae73e6059b824d9a 100644 (file)
--- a/drivers/usb/gadget/f_rndis.c
+++ b/drivers/usb/gadget/f_rndis.c
@@ -127,16 +127,9 @@ static struct usb_interface_descriptor rndis_control_intf __initdata = {
        /* .bInterfaceNumber = DYNAMIC */
        /* status endpoint is optional; this could be patched later */
        .bNumEndpoints =        1,
-#ifdef CONFIG_USB_ANDROID_RNDIS_WCEIS
-       /* "Wireless" RNDIS; auto-detected by Windows */
-       .bInterfaceClass =      USB_CLASS_WIRELESS_CONTROLLER,
-       .bInterfaceSubClass = 1,
-       .bInterfaceProtocol =   3,
-#else
        .bInterfaceClass =      USB_CLASS_COMM,
        .bInterfaceSubClass =   USB_CDC_SUBCLASS_ACM,
        .bInterfaceProtocol =   USB_CDC_ACM_PROTO_VENDOR,
-#endif
        /* .iInterface = DYNAMIC */
 };