diff options
| author | John Stultz <john.stultz@linaro.org> | 2011-08-17 10:13:16 -0700 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2011-08-17 10:13:16 -0700 |
| commit | e83e52de655524015d81b3a5def4428704443461 (patch) | |
| tree | e598e7a9b45a5bac25aa1700868452c39e2157a3 /drivers/usb/gadget/u_ether.h | |
| parent | c6952bc6d4a64535c31e22ab68c7d6a316ca717b (diff) | |
| parent | ceb40e21b2676060396abdb0dcde9f20d73bfe62 (diff) | |
Merge branch 'upstream/android-3.0' into linaro-android-3.0
Diffstat (limited to 'drivers/usb/gadget/u_ether.h')
| -rw-r--r-- | drivers/usb/gadget/u_ether.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/usb/gadget/u_ether.h b/drivers/usb/gadget/u_ether.h index 5bb1021f6ab..64b65f92168 100644 --- a/drivers/usb/gadget/u_ether.h +++ b/drivers/usb/gadget/u_ether.h @@ -86,6 +86,9 @@ struct gether { /* netdev setup/teardown as directed by the gadget driver */ int gether_setup(struct usb_gadget *g, u8 ethaddr[ETH_ALEN]); void gether_cleanup(void); +/* variant of gether_setup that allows customizing network device name */ +int gether_setup_name(struct usb_gadget *g, u8 ethaddr[ETH_ALEN], + const char *netname); /* connect/disconnect is handled by individual functions */ struct net_device *gether_connect(struct gether *); |