From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andy Gospodarek Subject: Re: [patch net-next v3 13/17] bridge: move private brport flags to if_bridge.h so port drivers can use flags Date: Tue, 25 Nov 2014 11:01:57 -0500 Message-ID: <20141125160157.GH27416@gospo.rtplab.test> References: <1416911328-10979-1-git-send-email-jiri@resnulli.us> <1416911328-10979-14-git-send-email-jiri@resnulli.us> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: netdev@vger.kernel.org, davem@davemloft.net, nhorman@tuxdriver.com, andy@greyhouse.net, tgraf@suug.ch, dborkman@redhat.com, ogerlitz@mellanox.com, jesse@nicira.com, pshelar@nicira.com, azhou@nicira.com, ben@decadent.org.uk, stephen@networkplumber.org, jeffrey.t.kirsher@intel.com, vyasevic@redhat.com, xiyou.wangcong@gmail.com, john.r.fastabend@intel.com, edumazet@google.com, jhs@mojatatu.com, sfeldma@gmail.com, f.fainelli@gmail.com, roopa@cumulusnetworks.com, linville@tuxdriver.com, jasowang@redhat.com, ebiederm@xmission.com, nicolas.dichtel@6wind.com, ryazanov.s.a@gmail.com, buytenh@wantstofly.org, aviadr@mellanox.com, nbd@openwrt.org, alexei.starovoitov@gmail.com, Neil.Jerram@metaswitch.com, ronye@mellanox.com, simon.horman@netronome.com, alexander.h.duyck@redhat.com, john.ronciak@intel.com, mleitner@redhat.com, shrijeet@gmail.com, bcrl@kvack.org To: Jiri Pirko Return-path: Received: from ext3.cumulusnetworks.com ([198.211.106.187]:45523 "EHLO ext3.cumulusnetworks.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751019AbaKYQCG (ORCPT ); Tue, 25 Nov 2014 11:02:06 -0500 Content-Disposition: inline In-Reply-To: <1416911328-10979-14-git-send-email-jiri@resnulli.us> Sender: netdev-owner@vger.kernel.org List-ID: On Tue, Nov 25, 2014 at 11:28:44AM +0100, Jiri Pirko wrote: > From: Scott Feldman > > Signed-off-by: Scott Feldman > Signed-off-by: Jiri Pirko Acked-by: Andy Gospodarek > --- > 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 >