diff options
| author |   Rusty Russell <rusty@rustcorp.com.au> | 2007-11-07 16:34:49 +1100 |
|---|---|---|
| committer | Rusty Russell <rusty@rustcorp.com.au> | 2007-11-12 13:55:25 +1100 |
| commit | 4d125de3a5d130054df2285e542c1491d214d3e8 (patch) | |
| tree | 82059ae0c269a837b525c2b2a0efca1efb3ea8d1 /drivers/net/virtio_net.c | |
| parent | virtio: fix vring_init for 64 bits (diff) | |
| download | linux-dev-4d125de3a5d130054df2285e542c1491d214d3e8.tar.xz linux-dev-4d125de3a5d130054df2285e542c1491d214d3e8.zip | |
virtio: more fallout from scatterlist changes.
This fixes OOPS in network driver when CONFIG_DEBUG_SG=y.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Diffstat (limited to '')
| -rw-r--r-- | drivers/net/virtio_net.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index e396c9d2af8d..a75be57fb209 100644 --- a/drivers/net/virtio_net.c +++ b/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); |