diff options
| author | Jarek Poplawski <jarkao2@gmail.com> | 2008-04-06 23:40:53 -0700 |
|---|---|---|
| committer | Chris Wright <chrisw@sous-sol.org> | 2008-04-18 18:53:25 -0700 |
| commit | 08fb454fcf51b9133bb6d88e009d89127238e24c (patch) | |
| tree | 9c4dc4f73d680e29cee222883d8fe247c94c9737 | |
| parent | e982cc89839374bb1a504448401dfafaf772bdbf (diff) | |
netpoll: zap_completion_queue: adjust skb->users counter
Upstream commit: 8a455b087c9629b3ae3b521b4f1ed16672f978cc
zap_completion_queue() retrieves skbs from completion_queue where they have
zero skb->users counter. Before dev_kfree_skb_any() it should be non-zero
yet, so it's increased now.
Reported-and-tested-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Jarek Poplawski <jarkao2@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Chris Wright <chrisw@sous-sol.org>
| -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 c499b5c69bed..2386c5e16784 100644 --- a/net/core/netpoll.c +++ b/net/core/netpoll.c @@ -219,10 +219,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); + } } } |