From c04ec8063d3a89e5ae933c7b4be04476fe65c6de Mon Sep 17 00:00:00 2001 From: Herbert Xu Date: Thu, 10 Jun 2010 16:12:42 +0000 Subject: netpoll: Set npinfo to NULL even with ndo_netpoll_cleanup 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 Signed-off-by: David S. Miller --- net/core/netpoll.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'net/core/netpoll.c') diff --git a/net/core/netpoll.c b/net/core/netpoll.c index e034342c819c..19ff66079f76 100644 --- a/net/core/netpoll.c +++ b/net/core/netpoll.c @@ -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; } } -- cgit v1.2.2