提交 10408bb9 编写于 作者: R Rémi Denis-Courmont 提交者: Greg Kroah-Hartman

USB: f_phonet: avoid pskb_pull(), fix OOPS with CONFIG_HIGHMEM

This is similar to what we already do in cdc-phonet.c in the same
situation.
Signed-off-by: NRémi Denis-Courmont <remi.denis-courmont@nokia.com>
Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
上级 18f53461
...@@ -346,14 +346,19 @@ static void pn_rx_complete(struct usb_ep *ep, struct usb_request *req) ...@@ -346,14 +346,19 @@ static void pn_rx_complete(struct usb_ep *ep, struct usb_request *req)
if (unlikely(!skb)) if (unlikely(!skb))
break; break;
skb_add_rx_frag(skb, skb_shinfo(skb)->nr_frags, page, 0,
req->actual);
page = NULL;
if (req->actual < req->length) { /* Last fragment */ if (skb->len == 0) { /* First fragment */
skb->protocol = htons(ETH_P_PHONET); skb->protocol = htons(ETH_P_PHONET);
skb_reset_mac_header(skb); skb_reset_mac_header(skb);
pskb_pull(skb, 1); /* Can't use pskb_pull() on page in IRQ */
memcpy(skb_put(skb, 1), page_address(page), 1);
}
skb_add_rx_frag(skb, skb_shinfo(skb)->nr_frags, page,
skb->len == 0, req->actual);
page = NULL;
if (req->actual < req->length) { /* Last fragment */
skb->dev = dev; skb->dev = dev;
dev->stats.rx_packets++; dev->stats.rx_packets++;
dev->stats.rx_bytes += skb->len; dev->stats.rx_bytes += skb->len;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册