diff options
author | Scott Feldman <sfeldma@gmail.com> | 2014-11-28 08:34:22 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-12-02 23:01:22 -0500 |
commit | 065c212a9e25172069f368b36228379521dadb65 (patch) | |
tree | ce0367eb05b8dc562c9edb6b1a886948ee2fea4e /net/bridge/br_private.h | |
parent | cf6b8e1eedffd9ef9a22c0c9453d752b07daf89a (diff) |
bridge: move private brport flags to if_bridge.h so port drivers can use flags
Signed-off-by: Scott Feldman <sfeldma@gmail.com>
Signed-off-by: Jiri Pirko <jiri@resnulli.us>
Acked-by: Jamal Hadi Salim <jhs@mojatatu.com>
Acked-by: Andy Gospodarek <gospo@cumulusnetworks.com>
Acked-by: Florian Fainelli <f.fainelli@gmail.com
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bridge/br_private.h')
-rw-r--r-- | net/bridge/br_private.h | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h index cc36fb3efbdd..aea3d1339b3f 100644 --- a/net/bridge/br_private.h +++ b/net/bridge/br_private.h | |||
@@ -164,16 +164,6 @@ struct net_bridge_port | |||
164 | struct rcu_head rcu; | 164 | struct rcu_head rcu; |
165 | 165 | ||
166 | unsigned long flags; | 166 | unsigned long flags; |
167 | #define BR_HAIRPIN_MODE 0x00000001 | ||
168 | #define BR_BPDU_GUARD 0x00000002 | ||
169 | #define BR_ROOT_BLOCK 0x00000004 | ||
170 | #define BR_MULTICAST_FAST_LEAVE 0x00000008 | ||
171 | #define BR_ADMIN_COST 0x00000010 | ||
172 | #define BR_LEARNING 0x00000020 | ||
173 | #define BR_FLOOD 0x00000040 | ||
174 | #define BR_AUTO_MASK (BR_FLOOD | BR_LEARNING) | ||
175 | #define BR_PROMISC 0x00000080 | ||
176 | #define BR_PROXYARP 0x00000100 | ||
177 | 167 | ||
178 | #ifdef CONFIG_BRIDGE_IGMP_SNOOPING | 168 | #ifdef CONFIG_BRIDGE_IGMP_SNOOPING |
179 | struct bridge_mcast_own_query ip4_own_query; | 169 | struct bridge_mcast_own_query ip4_own_query; |