leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

usb: gadget: u_ether: add a flag to avoid skb_reserve() calling

Browse Source 
This patch adds a flag "no_skb_reserve" in struct eth_dev.
So, if a peripheral driver sets the quirk_avoids_skb_reserve flag,
upper network gadget drivers (e.g. f_ncm.c) can avoid skb_reserve()
calling using the flag as well.

Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
This commit is contained in:
Yoshihiro Shimoda 2016-08-22 17:48:26 +09:00 committed by Felipe Balbi
parent 60e7396f82
commit 05f6b0ff68
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/usb/gadget/function/u_ether.c
View File

@ -82,6 +82,7 @@ struct eth_dev {
#define WORK_RX_MEMORY 0 #define WORK_RX_MEMORY 0
bool zlp; bool zlp;
bool no_skb_reserve;
u8 host_mac[ETH_ALEN]; u8 host_mac[ETH_ALEN];
u8 dev_mac[ETH_ALEN]; u8 dev_mac[ETH_ALEN];
}; };
@ -233,7 +234,8 @@ rx_submit(struct eth_dev *dev, struct usb_request *req, gfp_t gfp_flags)
* but on at least one, checksumming fails otherwise. Note: * but on at least one, checksumming fails otherwise. Note:
* RNDIS headers involve variable numbers of LE32 values. * RNDIS headers involve variable numbers of LE32 values.
*/ */
skb_reserve(skb, NET_IP_ALIGN); if (likely(!dev->no_skb_reserve))
skb_reserve(skb, NET_IP_ALIGN);
req->buf = skb->data; req->buf = skb->data;
req->length = size; req->length = size;
@ -1063,6 +1065,7 @@ struct net_device *gether_connect(struct gether *link)
if (result == 0) { if (result == 0) {
dev->zlp = link->is_zlp_ok; dev->zlp = link->is_zlp_ok;
dev->no_skb_reserve = link->no_skb_reserve;
DBG(dev, "qlen %d\n", qlen(dev->gadget, dev->qmult)); DBG(dev, "qlen %d\n", qlen(dev->gadget, dev->qmult));
dev->header_len = link->header_len; dev->header_len = link->header_len;

1
drivers/usb/gadget/function/u_ether.h
View File

@ -64,6 +64,7 @@ struct gether {
struct usb_ep *out_ep; struct usb_ep *out_ep;
bool is_zlp_ok; bool is_zlp_ok;
bool no_skb_reserve;
u16 cdc_filter; u16 cdc_filter;