| commit | b4bf665c5761837f693e87ab27870a5868185ccc | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Wed Apr 14 06:45:44 2010 -0700 |
| committer | David S. Miller <davem@davemloft.net> | Wed Apr 14 06:45:44 2010 -0700 |
| tree | 5c48b5e305a0ec572fb7d4538ad0bde51171a543 | |
| parent | dad1e54b121d93ed47690d77736af63d3f11d657 [diff] |
virtio_net: Fix mis-merge. Pointed out by Stephen Rothwell. Signed-off-by: David S. Miller <davem@davemloft.net>
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index 7311651..b0a85d0 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c
@@ -329,7 +329,6 @@ 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;