summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShirley Ma <mashirle@us.ibm.com>2010-03-29 17:19:15 +0200
committerDavid S. Miller <davem@davemloft.net>2010-03-31 03:31:59 +0200
commit2c45cd43ff791cc4ab6a6332165ad53d7bcb3673 (patch)
tree5032ed32e2e9768a62ecd4776559037440bf87ae
parentvxge: Updating Maintainer list of S2IO 10GbE drivers (xframe / vxge). (diff)
downloadlinux-2c45cd43ff791cc4ab6a6332165ad53d7bcb3673.tar.xz
linux-2c45cd43ff791cc4ab6a6332165ad53d7bcb3673.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>
-rw-r--r--drivers/net/virtio_net.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index 25dc77ccbf58..3f5be35dea25 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -326,6 +326,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;
@@ -351,6 +352,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);