projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'upstream-4.6-rc1' of git://git.infradead.org/linux-ubifs
[deliverable/linux.git]
/
drivers
/
net
/
virtio_net.c
diff --git
a/drivers/net/virtio_net.c
b/drivers/net/virtio_net.c
index fb0eae42bf398c977fec8f2c4f59d74e5d9b4394..49d84e54034338ad230183eb9c414c5802c2944f 100644
(file)
--- a/
drivers/net/virtio_net.c
+++ b/
drivers/net/virtio_net.c
@@
-260,7
+260,7
@@
static struct sk_buff *page_to_skb(struct virtnet_info *vi,
p = page_address(page) + offset;
/* copy small packet so we can reuse these pages for small data */
- skb = n
etdev_alloc_skb_ip_align(vi->dev
, GOOD_COPY_LEN);
+ skb = n
api_alloc_skb(&rq->napi
, GOOD_COPY_LEN);
if (unlikely(!skb))
return NULL;
This page took
0.043776 seconds
and
5
git commands to generate.