diff options
author | Rusty Russell <rusty@rustcorp.com.au> | 2007-11-07 00:34:49 -0500 |
---|---|---|
committer | Rusty Russell <rusty@rustcorp.com.au> | 2007-11-11 21:55:25 -0500 |
commit | 4d125de3a5d130054df2285e542c1491d214d3e8 (patch) | |
tree | 82059ae0c269a837b525c2b2a0efca1efb3ea8d1 /drivers/net/virtio_net.c | |
parent | 44332f7167dfb1ca04af96a2cff938c5e23433db (diff) |
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 'drivers/net/virtio_net.c')
-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) | |||
146 | struct scatterlist sg[1+MAX_SKB_FRAGS]; | 146 | struct scatterlist sg[1+MAX_SKB_FRAGS]; |
147 | int num, err; | 147 | int num, err; |
148 | 148 | ||
149 | sg_init_table(sg, 1+MAX_SKB_FRAGS); | ||
149 | for (;;) { | 150 | for (;;) { |
150 | skb = netdev_alloc_skb(vi->dev, MAX_PACKET_LEN); | 151 | skb = netdev_alloc_skb(vi->dev, MAX_PACKET_LEN); |
151 | if (unlikely(!skb)) | 152 | if (unlikely(!skb)) |
@@ -231,6 +232,8 @@ static int start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
231 | const unsigned char *dest = ((struct ethhdr *)skb->data)->h_dest; | 232 | const unsigned char *dest = ((struct ethhdr *)skb->data)->h_dest; |
232 | DECLARE_MAC_BUF(mac); | 233 | DECLARE_MAC_BUF(mac); |
233 | 234 | ||
235 | sg_init_table(sg, 1+MAX_SKB_FRAGS); | ||
236 | |||
234 | pr_debug("%s: xmit %p %s\n", dev->name, skb, print_mac(mac, dest)); | 237 | pr_debug("%s: xmit %p %s\n", dev->name, skb, print_mac(mac, dest)); |
235 | 238 | ||
236 | free_old_xmit_skbs(vi); | 239 | free_old_xmit_skbs(vi); |