diff options
author | David S. Miller <davem@davemloft.net> | 2008-03-21 03:42:24 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-03-21 03:42:24 -0700 |
commit | a25606c845856e5ca5ed54d23cab077e3a49bf10 (patch) | |
tree | 1721e46532d6f48d605d401d7cee83f78f551c45 /net/core/netpoll.c | |
parent | 938b93adb2642885e688390396472d22a7548748 (diff) | |
parent | 94833dfb8c98ed4ca1944dd2c1339d88a2d1c758 (diff) | |
download | linux-3.10-a25606c845856e5ca5ed54d23cab077e3a49bf10.tar.gz linux-3.10-a25606c845856e5ca5ed54d23cab077e3a49bf10.tar.bz2 linux-3.10-a25606c845856e5ca5ed54d23cab077e3a49bf10.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/core/netpoll.c')
-rw-r--r-- | net/core/netpoll.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/core/netpoll.c b/net/core/netpoll.c index d0c8bf585f0..b04d643fc3c 100644 --- a/net/core/netpoll.c +++ b/net/core/netpoll.c @@ -215,10 +215,12 @@ static void zap_completion_queue(void) while (clist != NULL) { struct sk_buff *skb = clist; clist = clist->next; - if (skb->destructor) + if (skb->destructor) { + atomic_inc(&skb->users); dev_kfree_skb_any(skb); /* put this one back */ - else + } else { __kfree_skb(skb); + } } } |