projects
/
platform
/
kernel
/
linux-amlogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
dad1e54
)
virtio_net: Fix mis-merge.
author
David S. Miller
<davem@davemloft.net>
Wed, 14 Apr 2010 13:45:44 +0000
(06:45 -0700)
committer
David S. Miller
<davem@davemloft.net>
Wed, 14 Apr 2010 13:45:44 +0000
(06:45 -0700)
Pointed out by Stephen Rothwell.
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/virtio_net.c
patch
|
blob
|
history
diff --git
a/drivers/net/virtio_net.c
b/drivers/net/virtio_net.c
index
7311651
..
b0a85d0
100644
(file)
--- a/
drivers/net/virtio_net.c
+++ b/
drivers/net/virtio_net.c
@@
-329,7
+329,6
@@
static int add_recvbuf_small(struct virtnet_info *vi, gfp_t gfp)
struct skb_vnet_hdr *hdr;
int err;
- sg_init_table(sg, 2);
skb = netdev_alloc_skb_ip_align(vi->dev, MAX_PACKET_LEN);
if (unlikely(!skb))
return -ENOMEM;