commit 421a58e0331dde36c431d8816d299c2f24bd96d4
author Jaeseong GIM <jaeseong.gim@lge.com> Wed Jun 20 10:51:41 2012 -0700
committer Devin Kim <dojip.kim@lge.com> Thu Jun 28 20:41:17 2012 -0700
tree 802b333a1160bb24334aedf3e0dd1c3e752030a9
parent 6381ae7bba52db99284cccdc9a9efbcf69388930

usb: gadget: correct CONFIG_USB_ANDROID_CDC_ECM feature

Change-Id: I4cba91b4c54e1df68fa46d6981c513006879975f

drivers/usb/gadget/f_ecm.c

diff --git a/drivers/usb/gadget/f_ecm.c b/drivers/usb/gadget/f_ecm.c
index 1003b1d..b3eb79e 100644
--- a/drivers/usb/gadget/f_ecm.c
+++ b/drivers/usb/gadget/f_ecm.c
@@ -196,7 +196,7 @@
 	.bEndpointAddress =	USB_DIR_IN,
 	.bmAttributes =		USB_ENDPOINT_XFER_INT,
 	.wMaxPacketSize =	cpu_to_le16(ECM_STATUS_BYTECOUNT),
-#ifdef CONFIG_USB_CDC_ECM
+#ifdef CONFIG_USB_ANDROID_CDC_ECM
 	.bInterval =		4,
 #else
 	.bInterval =		1 << LOG2_STATUS_INTERVAL_MSEC,
@@ -209,7 +209,7 @@
 
 	.bEndpointAddress =	USB_DIR_IN,
 	.bmAttributes =		USB_ENDPOINT_XFER_BULK,
-#ifdef CONFIG_USB_CDC_ECM
+#ifdef CONFIG_USB_ANDROID_CDC_ECM
 	.wMaxPacketSize =	cpu_to_le16(64),
 #endif
 };
@@ -220,7 +220,7 @@
 
 	.bEndpointAddress =	USB_DIR_OUT,
 	.bmAttributes =		USB_ENDPOINT_XFER_BULK,
-#ifdef CONFIG_USB_CDC_ECM
+#ifdef CONFIG_USB_ANDROID_CDC_ECM
 	.wMaxPacketSize =	cpu_to_le16(64),
 #endif
 };
@@ -253,7 +253,7 @@
 	.bEndpointAddress =	USB_DIR_IN,
 	.bmAttributes =		USB_ENDPOINT_XFER_INT,
 	.wMaxPacketSize =	cpu_to_le16(ECM_STATUS_BYTECOUNT),
-#ifdef CONFIG_USB_CDC_ECM
+#ifdef CONFIG_USB_ANDROID_CDC_ECM
 	.bInterval =		4,
 #else
 	.bInterval =		LOG2_STATUS_INTERVAL_MSEC + 4,
@@ -596,7 +596,7 @@
 		if (alt == 1) {
 			struct net_device	*net;
 
-#ifdef CONFIG_USB_CDC_ECM
+#ifdef CONFIG_USB_ANDROID_CDC_ECM
 			/* Disable zlps in case of LG android USB and qct's udc.
 			 * By this, host driver can handle null packet properly.
 			 */
@@ -896,7 +896,7 @@
 		ecm_string_defs[0].id = status;
 		ecm_control_intf.iInterface = status;
 
-#ifdef CONFIG_USB_CDC_ECM
+#ifdef CONFIG_USB_ANDROID_CDC_ECM
 		/* MAC address */
 		status = usb_string_id(c->cdev);
 		if (status < 0)
@@ -913,7 +913,7 @@
 		ecm_string_defs[2].id = status;
 		ecm_data_intf.iInterface = status;
 
-#ifndef CONFIG_USB_CDC_ECM
+#ifndef CONFIG_USB_ANDROID_CDC_ECM
 		/* MAC address */
 		status = usb_string_id(c->cdev);
 		if (status < 0)
@@ -944,7 +944,7 @@
 
 	ecm->port.cdc_filter = DEFAULT_FILTER;
 
-#ifdef CONFIG_USB_CDC_ECM
+#ifdef CONFIG_USB_ANDROID_CDC_ECM
 	ecm->port.func.name = "ecm";
 #else
 	ecm->port.func.name = "cdc_ethernet";