diff options
| author |   Herbert Xu <herbert@gondor.apana.org.au> | 2010-06-10 16:12:42 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2010-06-15 10:58:37 -0700 |
| commit | c04ec8063d3a89e5ae933c7b4be04476fe65c6de (patch) | |
| tree | 5d426d3435a7b62557ea8121aca73bf70ccb2f76 /net | |
| parent | bnx2x: Fix link problem with some DACs (diff) | |
| download | linux-dev-c04ec8063d3a89e5ae933c7b4be04476fe65c6de.tar.xz linux-dev-c04ec8063d3a89e5ae933c7b4be04476fe65c6de.zip | |
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 <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/core/netpoll.c | 3 |
1 files changed, 1 insertions, 2 deletions
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; } } |