From: 黄涛 <huangtao@rock-chips.com>
Date: Sat, 30 Jul 2011 14:26:46 +0000 (+0800)
Subject: Revert "Add USB_ANDROID_RNDIS_WCEIS option."
X-Git-Tag: firefly_0821_release~9984
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=c6b222929400507816662583c734da1caf55df02;p=firefly-linux-kernel-4.4.55.git

Revert "Add USB_ANDROID_RNDIS_WCEIS option."

This reverts commit aace891ed58b0081b0207debb517567a499b50ed.
---

diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig
index 47cc0dbc4248..f703c762e0e4 100644
--- 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 e1ea22fe0e61..77ff19eebbfa 100755
--- 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 21bf50f5bbb8..67a923fce6f0 100644
--- 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 */
 };