aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2010-04-14 09:45:44 -0400
committerDavid S. Miller <davem@davemloft.net>2010-04-14 09:45:44 -0400
commitb4bf665c5761837f693e87ab27870a5868185ccc (patch)
tree5c48b5e305a0ec572fb7d4538ad0bde51171a543
parentdad1e54b121d93ed47690d77736af63d3f11d657 (diff)
virtio_net: Fix mis-merge.
Pointed out by Stephen Rothwell. Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/virtio_net.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index 73116512ca05..b0a85d038796 100644
--- 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)
329 struct skb_vnet_hdr *hdr; 329 struct skb_vnet_hdr *hdr;
330 int err; 330 int err;
331 331
332 sg_init_table(sg, 2);
333 skb = netdev_alloc_skb_ip_align(vi->dev, MAX_PACKET_LEN); 332 skb = netdev_alloc_skb_ip_align(vi->dev, MAX_PACKET_LEN);
334 if (unlikely(!skb)) 333 if (unlikely(!skb))
335 return -ENOMEM; 334 return -ENOMEM;