nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

netpoll: remove IFF_IN_NETPOLL flag

Browse source 
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>
This commit is contained in:
Amerigo Wang 2011-02-17 23:43:33 +00:00 committed by David S. Miller
parent 8a8efa22f5
commit 080e4130b1
4 changed files with 7 additions and 12 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/net/bonding/bond_main.c
View file

@ -423,11 +423,9 @@ int bond_dev_queue_xmit(struct bonding *bond, struct sk_buff *skb,
{ {
skb->dev = slave_dev; skb->dev = slave_dev;
skb->priority = 1; skb->priority = 1;
if (unlikely(netpoll_tx_running(slave_dev))) { if (unlikely(netpoll_tx_running(slave_dev)))
slave_dev->priv_flags |= IFF_IN_NETPOLL;
bond_netpoll_send_skb(bond_get_slave_by_dev(bond, slave_dev), skb); bond_netpoll_send_skb(bond_get_slave_by_dev(bond, slave_dev), skb);
slave_dev->priv_flags &= ~IFF_IN_NETPOLL; else
} else
dev_queue_xmit(skb); dev_queue_xmit(skb);
return 0; return 0;

2
drivers/net/bonding/bonding.h
View file

@ -133,7 +133,7 @@ static inline void unblock_netpoll_tx(void)
static inline int is_netpoll_tx_blocked(struct net_device *dev) static inline int is_netpoll_tx_blocked(struct net_device *dev)
{ {
if (unlikely(dev->priv_flags & IFF_IN_NETPOLL)) if (unlikely(netpoll_tx_running(dev)))
return atomic_read(&netpoll_block_tx); return atomic_read(&netpoll_block_tx);
return 0; return 0;
} }

9
include/linux/if.h
View file

@ -71,11 +71,10 @@
* release skb->dst * release skb->dst
*/ */
#define IFF_DONT_BRIDGE 0x800 /* disallow bridging this ether dev */ #define IFF_DONT_BRIDGE 0x800 /* disallow bridging this ether dev */
#define IFF_IN_NETPOLL 0x1000 /* whether we are processing netpoll */ #define IFF_DISABLE_NETPOLL 0x1000 /* disable netpoll at run-time */
#define IFF_DISABLE_NETPOLL 0x2000 /* disable netpoll at run-time */ #define IFF_MACVLAN_PORT 0x2000 /* device used as macvlan port */
#define IFF_MACVLAN_PORT 0x4000 /* device used as macvlan port */ #define IFF_BRIDGE_PORT 0x4000 /* device used as bridge port */
#define IFF_BRIDGE_PORT 0x8000 /* device used as bridge port */ #define IFF_OVS_DATAPATH 0x8000 /* device used as Open vSwitch
#define IFF_OVS_DATAPATH 0x10000 /* device used as Open vSwitch
* datapath port */ * datapath port */
#define IF_GET_IFACE 0x0001 /* for querying only */ #define IF_GET_IFACE 0x0001 /* for querying only */

2
net/core/netpoll.c
View file

@ -313,9 +313,7 @@ void netpoll_send_skb_on_dev(struct netpoll *np, struct sk_buff *skb,
tries > 0; --tries) { tries > 0; --tries) {
if (__netif_tx_trylock(txq)) { if (__netif_tx_trylock(txq)) {
if (!netif_tx_queue_stopped(txq)) { if (!netif_tx_queue_stopped(txq)) {
dev->priv_flags |= IFF_IN_NETPOLL;
status = ops->ndo_start_xmit(skb, dev); status = ops->ndo_start_xmit(skb, dev);
dev->priv_flags &= ~IFF_IN_NETPOLL;
if (status == NETDEV_TX_OK) if (status == NETDEV_TX_OK)
txq_trans_update(txq); txq_trans_update(txq);
} }