Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/vxy/lksctp-dev

[linux-2.6] / net / core / netpoll.c

diff --git a/net/core/netpoll.c b/net/core/netpoll.c
index 4b06d1936375b9789b3ce538933edd2dc1701fba..de1b26aa5720f011616413d87d852f94d46f9c52 100644 (file)
--- a/net/core/netpoll.c
+++ b/net/core/netpoll.c
@@ -783,7 +783,6 @@ void netpoll_cleanup(struct netpoll *np)
                                spin_unlock_irqrestore(&npinfo->rx_lock, flags);
                        }
 
-                       np->dev->npinfo = NULL;
                        if (atomic_dec_and_test(&npinfo->refcnt)) {
                                skb_queue_purge(&npinfo->arp_tx);
                                skb_queue_purge(&npinfo->txq);
@@ -796,6 +795,7 @@ void netpoll_cleanup(struct netpoll *np)
                                        kfree_skb(skb);
                                }
                                kfree(npinfo);
+                               np->dev->npinfo = NULL;
                        }
                }