aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/bonding/bonding.h
diff options
context:
space:
mode:
authorAmerigo Wang <amwang@redhat.com>2011-02-17 18:43:33 -0500
committerDavid S. Miller <davem@davemloft.net>2011-02-27 19:11:51 -0500
commit080e4130b1fb6a02e75149a1cccc8192e734713d (patch)
tree09627d9d6e7811fc4ae119df03b892327efbd0dc /drivers/net/bonding/bonding.h
parent8a8efa22f51b3c3f879d272914e3dbbc2041bf91 (diff)
netpoll: remove IFF_IN_NETPOLL flag
V4: rebase to net-next-2.6 This patch removes the flag IFF_IN_NETPOLL, we don't need it any more since we have netpoll_tx_running() now. Signed-off-by: WANG Cong <amwang@redhat.com> Acked-by: Neil Horman <nhorman@tuxdriver.com> Cc: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/bonding/bonding.h')
-rw-r--r--drivers/net/bonding/bonding.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/bonding/bonding.h b/drivers/net/bonding/bonding.h
index 0a3e00b220b7..a401b8df84f0 100644
--- a/drivers/net/bonding/bonding.h
+++ b/drivers/net/bonding/bonding.h
@@ -133,7 +133,7 @@ static inline void unblock_netpoll_tx(void)
133 133
134static inline int is_netpoll_tx_blocked(struct net_device *dev) 134static inline int is_netpoll_tx_blocked(struct net_device *dev)
135{ 135{
136 if (unlikely(dev->priv_flags & IFF_IN_NETPOLL)) 136 if (unlikely(netpoll_tx_running(dev)))
137 return atomic_read(&netpoll_block_tx); 137 return atomic_read(&netpoll_block_tx);
138 return 0; 138 return 0;
139} 139}