Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

1 files changed, 4 insertions, 2 deletions

diff --git a/net/core/netpoll.c b/net/core/netpoll.c
index d0c8bf585f06..b04d643fc3c7 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);
+                        }
                 }
         }