diff options
| author | Mike Lockwood <lockwood@android.com> | 2011-12-02 13:57:29 +0800 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2012-02-14 14:26:12 -0800 |
| commit | 1df1f9eb3071f054df69703841e0a43df4e77ae6 (patch) | |
| tree | 2e101343ff0bcce0e7dd8d401532531bb471d6bb /include | |
| parent | 27950968ea6810fd1a2429e134c9d844ac5390e9 (diff) | |
USB: gadget: f_rndis: Add platform data for RNDIS vendor ID and MAC address.
This fixes a kernel panic in rndis.c when receiving the
OID_GEN_VENDOR_DESCRIPTION command.
Signed-off-by: Mike Lockwood <lockwood@android.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/usb/android_composite.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/include/linux/usb/android_composite.h b/include/linux/usb/android_composite.h index 328016813dd..50889ba138b 100644 --- a/include/linux/usb/android_composite.h +++ b/include/linux/usb/android_composite.h @@ -18,6 +18,7 @@ #define __LINUX_USB_ANDROID_H #include <linux/usb/composite.h> +#include <linux/if_ether.h> struct android_usb_function { struct list_head list; @@ -80,6 +81,13 @@ struct usb_mass_storage_platform_data { int nluns; }; +/* Platform data for USB ethernet driver. */ +struct usb_ether_platform_data { + u8 ethaddr[ETH_ALEN]; + u32 vendorID; + const char *vendorDescr; +}; + extern void android_usb_set_connected(int on); extern void android_register_function(struct android_usb_function *f); |