[PATCH 1/7] netpoll: Set npinfo to NULL even with ndo_netpoll_cleanup

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: Herbert Xu
Date: Thursday, June 10, 2010 - 5:42 am

netpoll: Set npinfo to NULL even with ndo_netpoll_cleanup

Sinec 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>
---

 net/core/netpoll.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/net/core/netpoll.c b/net/core/netpoll.c
index 94825b1..748c930 100644
--- a/net/core/netpoll.c
+++ b/net/core/netpoll.c
@@ -898,8 +898,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;
 			}
 		}
 
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
[0/8] netpoll/bridge fixes, Herbert Xu, (Thu Jun 10, 5:40 am)
[PATCH 1/7] netpoll: Set npinfo to NULL even with ndo_netp ..., Herbert Xu, (Thu Jun 10, 5:42 am)
[PATCH 3/7] netpoll: Fix RCU usage, Herbert Xu, (Thu Jun 10, 5:42 am)
[PATCH 5/7] netpoll: Add ndo_netpoll_setup, Herbert Xu, (Thu Jun 10, 5:42 am)
[PATCH 7/7] bridge: Fix netpoll support, Herbert Xu, (Thu Jun 10, 5:42 am)
Re: [0/8] netpoll/bridge fixes, Stephen Hemminger, (Thu Jun 10, 7:49 am)
Re: [0/8] netpoll/bridge fixes, Herbert Xu, (Thu Jun 10, 2:56 pm)
Re: [0/8] netpoll/bridge fixes, Stephen Hemminger, (Thu Jun 10, 2:59 pm)
Re: [0/8] netpoll/bridge fixes, Herbert Xu, (Thu Jun 10, 3:48 pm)
Re: [0/8] netpoll/bridge fixes, Herbert Xu, (Thu Jun 10, 7:11 pm)
[PATCH 3/8] netpoll: Fix RCU usage, Herbert Xu, (Thu Jun 10, 7:12 pm)
[PATCH 5/8] netpoll: Add ndo_netpoll_setup, Herbert Xu, (Thu Jun 10, 7:12 pm)
[PATCH 7/8] netpoll: Add netpoll_tx_running, Herbert Xu, (Thu Jun 10, 7:12 pm)
[PATCH 8/8] bridge: Fix netpoll support, Herbert Xu, (Thu Jun 10, 7:12 pm)
fired a bug report on bugzilla.redhat.com, Qianfeng Zhang, (Thu Jun 10, 8:08 pm)
Re: [0/8] netpoll/bridge fixes, Matt Mackall, (Fri Jun 11, 1:03 pm)
Re: [PATCH 3/8] netpoll: Fix RCU usage, Paul E. McKenney, (Fri Jun 11, 4:10 pm)
Re: [0/8] netpoll/bridge fixes, Cong Wang, (Tue Jun 15, 3:17 am)
Re: [PATCH 8/8] bridge: Fix netpoll support, Cong Wang, (Tue Jun 15, 3:28 am)
Re: [0/8] netpoll/bridge fixes, David Miller, (Tue Jun 15, 11:39 am)
Re: [0/8] netpoll/bridge fixes, Eric Dumazet, (Tue Jun 15, 7:58 pm)
Re: [0/8] netpoll/bridge fixes, Eric Dumazet, (Tue Jun 15, 8:03 pm)
Re: [0/8] netpoll/bridge fixes, Herbert Xu, (Tue Jun 15, 8:33 pm)
Re: [0/8] netpoll/bridge fixes, David Miller, (Tue Jun 15, 9:47 pm)
Re: [0/8] netpoll/bridge fixes, Paul E. McKenney, (Tue Jun 15, 10:08 pm)
Re: [0/8] netpoll/bridge fixes, Eric Dumazet, (Tue Jun 15, 11:16 pm)
Re: [0/8] netpoll/bridge fixes, Eric Dumazet, (Tue Jun 15, 11:21 pm)
Re: [0/8] netpoll/bridge fixes, Paul E. McKenney, (Wed Jun 16, 9:01 am)
Re: [0/8] netpoll/bridge fixes, Paul E. McKenney, (Wed Jun 16, 4:02 pm)
Re: [0/8] netpoll/bridge fixes, Michael S. Tsirkin, (Thu Jun 17, 3:18 am)
Re: [PATCH 8/8] bridge: Fix netpoll support, Herbert Xu, (Thu Jun 17, 3:38 am)
Re: [PATCH 8/8] bridge: Fix netpoll support, Herbert Xu, (Thu Jun 17, 3:55 am)
Re: [PATCH 8/8] bridge: Fix netpoll support, Cong Wang, (Thu Jun 17, 3:57 am)
Re: [0/8] netpoll/bridge fixes, Paul E. McKenney, (Thu Jun 17, 2:26 pm)
Re: [PATCH 8/8] bridge: Fix netpoll support, Cong Wang, (Thu Jun 17, 8:06 pm)
Re: [0/8] netpoll/bridge fixes, Yanko Kaneti, (Tue Jun 29, 5:53 am)
Re: [0/8] netpoll/bridge fixes, Michael S. Tsirkin, (Mon Jul 19, 3:19 am)
Re: [0/8] netpoll/bridge fixes, Herbert Xu, (Mon Jul 19, 3:53 am)
Re: [0/8] netpoll/bridge fixes, Herbert Xu, (Mon Jul 19, 4:54 am)
Re: [0/8] netpoll/bridge fixes, David Miller, (Mon Jul 19, 9:05 am)
Re: [0/8] netpoll/bridge fixes, Eric Dumazet, (Mon Jul 19, 9:52 am)
Re: [0/8] netpoll/bridge fixes, David Miller, (Mon Jul 19, 1:35 pm)
Re: [0/8] netpoll/bridge fixes, Herbert Xu, (Mon Jul 19, 10:26 pm)
Re: [0/8] netpoll/bridge fixes, David Miller, (Mon Jul 19, 11:28 pm)