diff options
| author | David S. Miller <davem@davemloft.net> | 2008-05-23 03:05:14 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-05-23 03:05:14 -0400 |
| commit | 7bece8155be133cd67c41eed2b31c60a310609de (patch) | |
| tree | 906a62dcf10c1f2e6c1188a2b6e386668fcd9fe3 /drivers/net/virtio_net.c | |
| parent | b9a2f2e450b0f770bb4347ae8d48eb2dea701e24 (diff) | |
| parent | bdefff1f54cb76a19700663f211350de2f65cc91 (diff) | |
Merge branch 'upstream-davem' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/virtio_net.c')
| -rw-r--r-- | drivers/net/virtio_net.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index f926b5ab3d09..fe7cdf2a2a23 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c | |||
| @@ -470,8 +470,7 @@ static void virtnet_remove(struct virtio_device *vdev) | |||
| 470 | kfree_skb(skb); | 470 | kfree_skb(skb); |
| 471 | vi->num--; | 471 | vi->num--; |
| 472 | } | 472 | } |
| 473 | while ((skb = __skb_dequeue(&vi->send)) != NULL) | 473 | __skb_queue_purge(&vi->send); |
| 474 | kfree_skb(skb); | ||
| 475 | 474 | ||
| 476 | BUG_ON(vi->num != 0); | 475 | BUG_ON(vi->num != 0); |
| 477 | 476 | ||