diff options
| author | David S. Miller <davem@davemloft.net> | 2010-04-14 08:01:33 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-04-14 08:01:33 -0400 |
| commit | dad1e54b121d93ed47690d77736af63d3f11d657 (patch) | |
| tree | 36fdd29537e43bbb4f36252e010a591ae6fe20bc /drivers/net/virtio_net.c | |
| parent | 1253332f75f3774cc84d0b7693152656848901f9 (diff) | |
| parent | 0110d6f22f392f976e84ab49da1b42f85b64a3c5 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/pcmcia/smc91c92_cs.c
drivers/net/virtio_net.c
Diffstat (limited to 'drivers/net/virtio_net.c')
| -rw-r--r-- | drivers/net/virtio_net.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index b0a85d038796..73116512ca05 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c | |||
| @@ -329,6 +329,7 @@ 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); | ||
| 332 | skb = netdev_alloc_skb_ip_align(vi->dev, MAX_PACKET_LEN); | 333 | skb = netdev_alloc_skb_ip_align(vi->dev, MAX_PACKET_LEN); |
| 333 | if (unlikely(!skb)) | 334 | if (unlikely(!skb)) |
| 334 | return -ENOMEM; | 335 | return -ENOMEM; |