Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[mv-sheeva.git] / drivers / usb / gadget / u_ether.h

diff --git a/drivers/usb/gadget/u_ether.h b/drivers/usb/gadget/u_ether.h
index 0d1f7ae3b0713877abc8c1f4d04b392ca1f0c2e9..91b39ffdf6eacc56b4a56807913bf166d2657398 100644 (file)
--- a/drivers/usb/gadget/u_ether.h
+++ b/drivers/usb/gadget/u_ether.h
@@ -60,12 +60,13 @@ struct gether {
 
        u16                             cdc_filter;
 
-       /* hooks for added framing, as needed for RNDIS and EEM.
-        * we currently don't support multiple frames per SKB.
-        */
+       /* hooks for added framing, as needed for RNDIS and EEM. */
        u32                             header_len;
-       struct sk_buff                  *(*wrap)(struct sk_buff *skb);
-       int                             (*unwrap)(struct sk_buff *skb);
+       struct sk_buff                  *(*wrap)(struct gether *port,
+                                               struct sk_buff *skb);
+       int                             (*unwrap)(struct gether *port,
+                                               struct sk_buff *skb,
+                                               struct sk_buff_head *list);
 
        /* called on network open/close */
        void                            (*open)(struct gether *);
@@ -109,6 +110,7 @@ static inline bool can_support_ecm(struct usb_gadget *gadget)
 /* each configuration may bind one instance of an ethernet link */
 int geth_bind_config(struct usb_configuration *c, u8 ethaddr[ETH_ALEN]);
 int ecm_bind_config(struct usb_configuration *c, u8 ethaddr[ETH_ALEN]);
+int eem_bind_config(struct usb_configuration *c);
 
 #ifdef CONFIG_USB_ETH_RNDIS