mako: tethering gadget(CDC-ECM) is replaced with RNDIS
Change-Id: I6e67ac13011a1cb4c2607e6a6b7a96e1a385939e
diff --git a/arch/arm/configs/mako_defconfig b/arch/arm/configs/mako_defconfig
index 054a6c4..44a4e3d 100644
--- a/arch/arm/configs/mako_defconfig
+++ b/arch/arm/configs/mako_defconfig
@@ -432,7 +432,6 @@
CONFIG_USB_CI13XXX_MSM=y
CONFIG_USB_G_ANDROID=y
CONFIG_USB_ANDROID_RMNET_CTRL_SMD=y
-CONFIG_USB_ANDROID_CDC_ECM=y
CONFIG_MMC=y
CONFIG_MMC_PERF_PROFILING=y
CONFIG_MMC_UNSAFE_RESUME=y
diff --git a/drivers/usb/gadget/android.c b/drivers/usb/gadget/android.c
index 0823ab8..2d4d960 100644
--- a/drivers/usb/gadget/android.c
+++ b/drivers/usb/gadget/android.c
@@ -1057,7 +1057,7 @@
rndis->ethaddr[0], rndis->ethaddr[1], rndis->ethaddr[2],
rndis->ethaddr[3], rndis->ethaddr[4], rndis->ethaddr[5]);
- ret = gether_setup_name(c->cdev->gadget, rndis->ethaddr, "rndis");
+ ret = gether_setup_name(c->cdev->gadget, rndis->ethaddr, "usb");
if (ret) {
pr_err("%s: gether_setup failed\n", __func__);
return ret;