diff options
| author | Paul Kocialkowski <contact@paulk.fr> | 2014-05-02 20:40:22 +0200 |
|---|---|---|
| committer | Paul Kocialkowski <contact@paulk.fr> | 2014-05-02 20:40:22 +0200 |
| commit | d663e11e54d390fba27286f1f6c225bad6c744b3 (patch) | |
| tree | f7d923d120bacac30800064c6690de76fae28e7e | |
| parent | a142b46e7fc2722c7bd8f4715910089e5c91a5f9 (diff) | |
| download | kernel_goldelico_gta04-d663e11e54d390fba27286f1f6c225bad6c744b3.zip kernel_goldelico_gta04-d663e11e54d390fba27286f1f6c225bad6c744b3.tar.gz kernel_goldelico_gta04-d663e11e54d390fba27286f1f6c225bad6c744b3.tar.bz2 | |
Revert "gadget/android.c: fix compilation on 3.11"
This reverts commit 941b99efa3dd974009fbaa5e932825343d533f8a.
| -rw-r--r-- | drivers/usb/gadget/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/usb/gadget/android.c | 20 |
2 files changed, 6 insertions, 16 deletions
diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig index df696de..6f407d3 100644 --- a/drivers/usb/gadget/Kconfig +++ b/drivers/usb/gadget/Kconfig @@ -959,8 +959,6 @@ config USB_G_PRINTER config USB_G_ANDROID boolean "Android Composite Gadget" - select USB_LIBCOMPOSITE - select USB_U_ETHER help The Android Composite Gadget supports multiple USB functions: adb, acm, mass storage, mtp, accessory diff --git a/drivers/usb/gadget/android.c b/drivers/usb/gadget/android.c index e7bb39a..f899bb8 100644 --- a/drivers/usb/gadget/android.c +++ b/drivers/usb/gadget/android.c @@ -35,11 +35,10 @@ #include "f_mass_storage.c" #include "f_mtp.c" #include "f_accessory.c" -//#define USB_ETH_RNDIS y +#define USB_ETH_RNDIS y #include "f_rndis.c" #include "rndis.c" -//#include "u_ether.c" -#include "u_ether.h" +#include "u_ether.c" MODULE_AUTHOR("Mike Lockwood"); MODULE_DESCRIPTION("Android Composite USB Driver"); @@ -561,7 +560,7 @@ struct rndis_function_config { char manufacturer[256]; /* "Wireless" RNDIS; auto-detected by Windows */ bool wceis; - struct eth_dev *dev; + struct eth_dev *dev; }; static int @@ -585,8 +584,7 @@ rndis_function_bind_config(struct android_usb_function *f, struct usb_configuration *c) { int ret; - //struct eth_dev *dev; - struct net_device *dev; + struct eth_dev *dev; struct rndis_function_config *rndis = f->config; if (!rndis) { @@ -598,19 +596,13 @@ rndis_function_bind_config(struct android_usb_function *f, rndis->ethaddr[0], rndis->ethaddr[1], rndis->ethaddr[2], rndis->ethaddr[3], rndis->ethaddr[4], rndis->ethaddr[5]); - //TODO - //USB_ETHERNET_MODULE_PARAMETERS(); - //dev = gether_setup(cdev->gadget, dev_addr, host_addr, gfs_host_mac, qmult); - dev = gether_setup_name_default("rndis"); - gether_set_gadget(dev, c->cdev->gadget); - gether_set_dev_addr(dev, rndis->ethaddr); - //dev = gether_setup_name(c->cdev->gadget, rndis->ethaddr, "rndis"); + dev = gether_setup_name(c->cdev->gadget, rndis->ethaddr, "rndis"); if (IS_ERR(dev)) { ret = PTR_ERR(dev); pr_err("%s: gether_setup failed\n", __func__); return ret; } - rndis->dev = netdev_priv(dev); + rndis->dev = dev; if (rndis->wceis) { /* "Wireless" RNDIS; auto-detected by Windows */ |