diff options
| author | John Stultz <john.stultz@linaro.org> | 2013-08-22 11:16:36 -0700 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2013-08-22 11:16:36 -0700 |
| commit | f4b6e629ec67e46e1ac6167058b172c152df92f8 (patch) | |
| tree | fc558e95481f4bc947fd2575b377d974ad93f575 | |
| parent | 67f5af793504cd876be13b09ddc3a125d1052166 (diff) | |
android-gadget: Fix build problem caused by 3.11-rc mergetracking-linaro-android-3.11-llct-20130904.0tracking-linaro-android-3.11-llct-20130829.0
Vishal Bhoj pointed out a build issue w/ the Android gadget driver:
drivers/usb/gadget/android.c: In function ‘rndis_function_bind_config’:
drivers/usb/gadget/android.c:599:2: error: too few arguments to function
‘gether_setup_name’
In file included from drivers/usb/gadget/android.c:41:0:
drivers/usb/gadget/u_ether.c:758:17: note: declared here
This adds the tweaks to the android gadget driver that f_rndis and
u_ether now require.
Reported-by: Vishal Bhoj <vishal.bhoj@linaro.org>
Signed-off-by: John Stultz <john.stultz@linaro.org>
| -rw-r--r-- | drivers/usb/gadget/android.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/usb/gadget/android.c b/drivers/usb/gadget/android.c index d0ec54b810c1..8245ebde727c 100644 --- a/drivers/usb/gadget/android.c +++ b/drivers/usb/gadget/android.c @@ -36,10 +36,14 @@ #include "f_mtp.c" #include "f_accessory.c" #define USB_ETH_RNDIS y +#define USB_FRNDIS_INCLUDED y #include "f_rndis.c" #include "rndis.c" #include "u_ether.c" +USB_ETHERNET_MODULE_PARAMETERS(); + + MODULE_AUTHOR("Mike Lockwood"); MODULE_DESCRIPTION("Android Composite USB Driver"); MODULE_LICENSE("GPL"); @@ -596,7 +600,7 @@ 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]); - dev = gether_setup_name(c->cdev->gadget, rndis->ethaddr, "rndis"); + dev = gether_setup_name(c->cdev->gadget,dev_addr, host_addr, rndis->ethaddr, qmult, "rndis"); if (IS_ERR(dev)) { ret = PTR_ERR(dev); pr_err("%s: gether_setup failed\n", __func__); |