summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorMike Lockwood <lockwood@android.com>2010-03-10 17:05:03 -0500
committerMike Lockwood <lockwood@android.com>2010-03-10 18:24:20 -0500
commit7dc693330c1fda407643b95c876fc072845c0593 (patch)
tree70c6bdc9174555f6892bc6560322a8b53439749e /include
parenta47633bdbcc9b87f2a72e9bdf317f05e2e6c8051 (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.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/include/linux/usb/android_composite.h b/include/linux/usb/android_composite.h
index 328016813dd5..50889ba138b9 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);