Skip to content

Commit

Permalink
virtio: more fallout from scatterlist changes.
Browse files Browse the repository at this point in the history
This fixes OOPS in network driver when CONFIG_DEBUG_SG=y.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
  • Loading branch information
Rusty Russell committed Nov 12, 2007
1 parent 44332f7 commit 4d125de
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions drivers/net/virtio_net.c
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit 4d125de

Please sign in to comment.