summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJarek Poplawski <jarkao2@gmail.com>2008-03-20 16:07:27 -0700
committerDavid S. Miller <davem@davemloft.net>2008-03-20 16:07:27 -0700
commit8a455b087c9629b3ae3b521b4f1ed16672f978cc (patch)
treedb93f743a1d9add48876d9d0ccdbc2696c0f771f
parent2bec008ca9fd009aa503b75344d1c22da9256141 (diff)
downloadlinux-8a455b087c9629b3ae3b521b4f1ed16672f978cc.tar.gz
linux-8a455b087c9629b3ae3b521b4f1ed16672f978cc.tar.bz2
linux-8a455b087c9629b3ae3b521b4f1ed16672f978cc.zip
netpoll: zap_completion_queue: adjust skb->users counter
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>
-rw-r--r--net/core/netpoll.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/net/core/netpoll.c b/net/core/netpoll.c
index 4b7e756181c9..c635de52526c 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);
+ }
}
}