[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20141125160157.GH27416@gospo.rtplab.test>
Date: Tue, 25 Nov 2014 11:01:57 -0500
From: Andy Gospodarek <gospo@...ulusnetworks.com>
To: Jiri Pirko <jiri@...nulli.us>
Cc: netdev@...r.kernel.org, davem@...emloft.net, nhorman@...driver.com,
andy@...yhouse.net, tgraf@...g.ch, dborkman@...hat.com,
ogerlitz@...lanox.com, jesse@...ira.com, pshelar@...ira.com,
azhou@...ira.com, ben@...adent.org.uk, stephen@...workplumber.org,
jeffrey.t.kirsher@...el.com, vyasevic@...hat.com,
xiyou.wangcong@...il.com, john.r.fastabend@...el.com,
edumazet@...gle.com, jhs@...atatu.com, sfeldma@...il.com,
f.fainelli@...il.com, roopa@...ulusnetworks.com,
linville@...driver.com, jasowang@...hat.com, ebiederm@...ssion.com,
nicolas.dichtel@...nd.com, ryazanov.s.a@...il.com,
buytenh@...tstofly.org, aviadr@...lanox.com, nbd@...nwrt.org,
alexei.starovoitov@...il.com, Neil.Jerram@...aswitch.com,
ronye@...lanox.com, simon.horman@...ronome.com,
alexander.h.duyck@...hat.com, john.ronciak@...el.com,
mleitner@...hat.com, shrijeet@...il.com, bcrl@...ck.org
Subject: Re: [patch net-next v3 13/17] bridge: move private brport flags to
if_bridge.h so port drivers can use flags
On Tue, Nov 25, 2014 at 11:28:44AM +0100, Jiri Pirko wrote:
> From: Scott Feldman <sfeldma@...il.com>
>
> Signed-off-by: Scott Feldman <sfeldma@...il.com>
> Signed-off-by: Jiri Pirko <jiri@...nulli.us>
Acked-by: Andy Gospodarek <gospo@...ulusnetworks.com>
> ---
> 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
>
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists