From cf1a694306cfeb048afc1aaad426737a4324dc60 Mon Sep 17 00:00:00 2001
From: Rusty Russell <rusty@rustcorp.com.au>
Date: Wed, 7 Nov 2007 16:34:49 +1100
Subject: [PATCH] --- yaml --- r: 73553 b: refs/heads/master c:
 4d125de3a5d130054df2285e542c1491d214d3e8 h: refs/heads/master i:   73551:
 ea7d4efdd0e223e1579c664bd117479692df7357 v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/net/virtio_net.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 86c49e73d15e..76ead5d4aa1f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 44332f7167dfb1ca04af96a2cff938c5e23433db
+refs/heads/master: 4d125de3a5d130054df2285e542c1491d214d3e8
diff --git a/trunk/drivers/net/virtio_net.c b/trunk/drivers/net/virtio_net.c
index e396c9d2af8d..a75be57fb209 100644
--- a/trunk/drivers/net/virtio_net.c
+++ b/trunk/drivers/net/virtio_net.c
@@ -146,6 +146,7 @@ static void try_fill_recv(struct virtnet_info *vi)
 	struct scatterlist sg[1+MAX_SKB_FRAGS];
 	int num, err;
 
+	sg_init_table(sg, 1+MAX_SKB_FRAGS);
 	for (;;) {
 		skb = netdev_alloc_skb(vi->dev, MAX_PACKET_LEN);
 		if (unlikely(!skb))
@@ -231,6 +232,8 @@ static int start_xmit(struct sk_buff *skb, struct net_device *dev)
 	const unsigned char *dest = ((struct ethhdr *)skb->data)->h_dest;
 	DECLARE_MAC_BUF(mac);
 
+	sg_init_table(sg, 1+MAX_SKB_FRAGS);
+
 	pr_debug("%s: xmit %p %s\n", dev->name, skb, print_mac(mac, dest));
 
 	free_old_xmit_skbs(vi);