Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 065c212a authored by Scott Feldman's avatar Scott Feldman Committed by David S. Miller
Browse files

bridge: move private brport flags to if_bridge.h so port drivers can use flags 



Signed-off-by: default avatarScott Feldman <sfeldma@gmail.com>
Signed-off-by: default avatarJiri Pirko <jiri@resnulli.us>
Acked-by: default avatarJamal Hadi Salim <jhs@mojatatu.com>
Acked-by: default avatarAndy Gospodarek <gospo@cumulusnetworks.com>
Acked-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent cf6b8e1e

include/linux/if_bridge.h

+12 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 


#include <linux/netdevice.h>

#include <uapi/linux/if_bridge.h>

#include <linux/bitops.h>



struct br_ip {

	union {
@@ -32,6 +33,17 @@ struct br_ip_list { 
	struct br_ip addr;

};



#define BR_HAIRPIN_MODE		BIT(0)

#define BR_BPDU_GUARD		BIT(1)

#define BR_ROOT_BLOCK		BIT(2)

#define BR_MULTICAST_FAST_LEAVE	BIT(3)

#define BR_ADMIN_COST		BIT(4)

#define BR_LEARNING		BIT(5)

#define BR_FLOOD		BIT(6)

#define BR_AUTO_MASK		(BR_FLOOD | BR_LEARNING)

#define BR_PROMISC		BIT(7)

#define BR_PROXYARP		BIT(8)



extern void brioctl_set(int (*ioctl_hook)(struct net *, unsigned int, void __user *));



typedef int br_should_route_hook_t(struct sk_buff *skb);

net/bridge/br_private.h

+0 −10
Original line number Diff line number Diff line
@@ -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;