diff options
| author | Shirley Ma <mashirle@us.ibm.com> | 2010-03-29 17:19:15 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-04-13 07:00:34 +0200 |
| commit | 0e413f22e4c1cbfe12907e462a7d739a2e316f2b (patch) | |
| tree | 81c774a0b38334184ae14efde570e96283dcae01 /drivers/net/virtio_net.c | |
| parent | Merge branch 'master' of /home/davem/src/GIT/linux-2.6/ (diff) | |
| download | linux-0e413f22e4c1cbfe12907e462a7d739a2e316f2b.tar.xz linux-0e413f22e4c1cbfe12907e462a7d739a2e316f2b.zip | |
virtio_net: missing sg_init_table
Add missing sg_init_table for sg_set_buf in virtio_net which
induced in defer skb patch.
Reported-by: Thomas Müller <thomas@mathtm.de>
Tested-by: Thomas Müller <thomas@mathtm.de>
Signed-off-by: Shirley Ma <xma@us.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/virtio_net.c')
| -rw-r--r-- | drivers/net/virtio_net.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index 6fb783ce20b9..b0577dd1a42d 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -327,6 +327,7 @@ static int add_recvbuf_small(struct virtnet_info *vi, gfp_t gfp) struct scatterlist sg[2]; int err; + sg_init_table(sg, 2); skb = netdev_alloc_skb_ip_align(vi->dev, MAX_PACKET_LEN); if (unlikely(!skb)) return -ENOMEM; @@ -352,6 +353,7 @@ static int add_recvbuf_big(struct virtnet_info *vi, gfp_t gfp) char *p; int i, err, offset; + sg_init_table(sg, MAX_SKB_FRAGS + 2); /* page in sg[MAX_SKB_FRAGS + 1] is list tail */ for (i = MAX_SKB_FRAGS + 1; i > 1; --i) { first = get_a_page(vi, gfp); |