diff options
| author | David S. Miller <davem@davemloft.net> | 2009-03-20 05:27:41 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-03-20 05:27:41 -0400 |
| commit | 2b1c4354de72ced917d2f3fe88117613f992234b (patch) | |
| tree | 3e7643cad45d94e3c331366418532043bd4fa5a9 /net/core | |
| parent | 5e140dfc1fe87eae27846f193086724806b33c7d (diff) | |
| parent | 170ebf85160dd128e1c4206cc197cce7d1424705 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/virtio_net.c
Diffstat (limited to 'net/core')
| -rw-r--r-- | net/core/dev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index c01303129119..ca212acd3348 100644 --- a/net/core/dev.c +++ b/net/core/dev.c | |||
| @@ -2712,7 +2712,7 @@ void netif_napi_del(struct napi_struct *napi) | |||
| 2712 | struct sk_buff *skb, *next; | 2712 | struct sk_buff *skb, *next; |
| 2713 | 2713 | ||
| 2714 | list_del_init(&napi->dev_list); | 2714 | list_del_init(&napi->dev_list); |
| 2715 | kfree(napi->skb); | 2715 | kfree_skb(napi->skb); |
| 2716 | 2716 | ||
| 2717 | for (skb = napi->gro_list; skb; skb = next) { | 2717 | for (skb = napi->gro_list; skb; skb = next) { |
| 2718 | next = skb->next; | 2718 | next = skb->next; |