netpoll: Set npinfo to NULL even with ndo_netpoll_cleanup
Herbert Xu [Thu, 10 Jun 2010 16:12:42 +0000 (16:12 +0000)]
Since we have to NULL npinfo regardless of whether there is a
ndo_netpoll_cleanup, it makes sense to do this unconditionally
in netpoll_cleanup rather than having every driver do it by
themselves.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>

net/core/netpoll.c

index e034342..19ff660 100644 (file)
@@ -867,8 +867,7 @@ void netpoll_cleanup(struct netpoll *np)
                                ops = np->dev->netdev_ops;
                                if (ops->ndo_netpoll_cleanup)
                                        ops->ndo_netpoll_cleanup(np->dev);
-                               else
-                                       np->dev->npinfo = NULL;
+                               np->dev->npinfo = NULL;
                        }
                }