Re: [patch net-next v3 13/17] bridge: move private brport flags to if_bridge.h so port drivers can use flags
From: Andy Gospodarek <hidden>
Date: 2014-11-25 16:02:06
On Tue, Nov 25, 2014 at 11:28:44AM +0100, Jiri Pirko wrote:
From: Scott Feldman <redacted> Signed-off-by: Scott Feldman <redacted> Signed-off-by: Jiri Pirko <jiri@resnulli.us>
Acked-by: Andy Gospodarek <redacted>
quoted hunk ↗ jump to hunk
--- new in v3 --- include/linux/if_bridge.h | 11 +++++++++++ net/bridge/br_private.h | 10 ---------- 2 files changed, 11 insertions(+), 10 deletions(-)diff --git a/include/linux/if_bridge.h b/include/linux/if_bridge.h index fa2eca6..b4bb104 100644 --- a/include/linux/if_bridge.h +++ b/include/linux/if_bridge.h@@ -32,6 +32,17 @@ struct br_ip_list { struct br_ip addr; }; +#define BR_HAIRPIN_MODE 0x00000001 +#define BR_BPDU_GUARD 0x00000002 +#define BR_ROOT_BLOCK 0x00000004 +#define BR_MULTICAST_FAST_LEAVE 0x00000008 +#define BR_ADMIN_COST 0x00000010 +#define BR_LEARNING 0x00000020 +#define BR_FLOOD 0x00000040 +#define BR_AUTO_MASK (BR_FLOOD | BR_LEARNING) +#define BR_PROMISC 0x00000080 +#define BR_PROXYARP 0x00000100 + extern void brioctl_set(int (*ioctl_hook)(struct net *, unsigned int, void __user *)); typedef int br_should_route_hook_t(struct sk_buff *skb);diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h index 02cd63b..3116bb0 100644 --- a/net/bridge/br_private.h +++ b/net/bridge/br_private.h@@ -164,16 +164,6 @@ struct net_bridge_port struct rcu_head rcu; unsigned long flags; -#define BR_HAIRPIN_MODE 0x00000001 -#define BR_BPDU_GUARD 0x00000002 -#define BR_ROOT_BLOCK 0x00000004 -#define BR_MULTICAST_FAST_LEAVE 0x00000008 -#define BR_ADMIN_COST 0x00000010 -#define BR_LEARNING 0x00000020 -#define BR_FLOOD 0x00000040 -#define BR_AUTO_MASK (BR_FLOOD | BR_LEARNING) -#define BR_PROMISC 0x00000080 -#define BR_PROXYARP 0x00000100 #ifdef CONFIG_BRIDGE_IGMP_SNOOPING struct bridge_mcast_own_query ip4_own_query;-- 1.9.3