diff options
| author | Amerigo Wang <amwang@redhat.com> | 2011-02-17 23:43:33 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-02-27 16:11:51 -0800 |
| commit | 080e4130b1fb6a02e75149a1cccc8192e734713d (patch) | |
| tree | 09627d9d6e7811fc4ae119df03b892327efbd0dc /include/linux/if.h | |
| parent | 8a8efa22f51b3c3f879d272914e3dbbc2041bf91 (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 'include/linux/if.h')
| -rw-r--r-- | include/linux/if.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/include/linux/if.h b/include/linux/if.h index 123959927745..3bc63e6a02f7 100644 --- a/include/linux/if.h +++ b/include/linux/if.h @@ -71,11 +71,10 @@ * release skb->dst */ #define IFF_DONT_BRIDGE 0x800 /* disallow bridging this ether dev */ -#define IFF_IN_NETPOLL 0x1000 /* whether we are processing netpoll */ -#define IFF_DISABLE_NETPOLL 0x2000 /* disable netpoll at run-time */ -#define IFF_MACVLAN_PORT 0x4000 /* device used as macvlan port */ -#define IFF_BRIDGE_PORT 0x8000 /* device used as bridge port */ -#define IFF_OVS_DATAPATH 0x10000 /* device used as Open vSwitch +#define IFF_DISABLE_NETPOLL 0x1000 /* disable netpoll at run-time */ +#define IFF_MACVLAN_PORT 0x2000 /* device used as macvlan port */ +#define IFF_BRIDGE_PORT 0x4000 /* device used as bridge port */ +#define IFF_OVS_DATAPATH 0x8000 /* device used as Open vSwitch * datapath port */ #define IF_GET_IFACE 0x0001 /* for querying only */ |