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

Commit 9ba18891 authored by Vlad Yasevich's avatar Vlad Yasevich Committed by David S. Miller
Browse files

bridge: Add flag to control mac learning. 



Allow user to control whether mac learning is enabled on the port.
By default, mac learning is enabled.  Disabling mac learning will
cause new dynamic FDB entries to not be created for a particular port.

Signed-off-by: default avatarVlad Yasevich <vyasevic@redhat.com>
Signed-off-by: default avatarStephen Hemminger <stephen@networkplumber.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 30f3a40f

include/uapi/linux/if_link.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -221,6 +221,7 @@ enum { 
	IFLA_BRPORT_GUARD,	/* bpdu guard              */

	IFLA_BRPORT_GUARD,	/* bpdu guard              */

	IFLA_BRPORT_PROTECT,	/* root port protection    */

	IFLA_BRPORT_PROTECT,	/* root port protection    */

	IFLA_BRPORT_FAST_LEAVE,	/* multicast fast leave    */

	IFLA_BRPORT_FAST_LEAVE,	/* multicast fast leave    */

	IFLA_BRPORT_LEARNING,	/* mac learning */

	__IFLA_BRPORT_MAX

	__IFLA_BRPORT_MAX

};

};

#define IFLA_BRPORT_MAX (__IFLA_BRPORT_MAX - 1)

#define IFLA_BRPORT_MAX (__IFLA_BRPORT_MAX - 1)

net/bridge/br_if.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -221,7 +221,7 @@ static struct net_bridge_port *new_nbp(struct net_bridge *br, 
	p->path_cost = port_cost(dev);

	p->path_cost = port_cost(dev);

	p->priority = 0x8000 >> BR_PORT_BITS;

	p->priority = 0x8000 >> BR_PORT_BITS;

	p->port_no = index;

	p->port_no = index;

	p->flags = 0;

	p->flags = BR_LEARNING;

	br_init_port(p);

	br_init_port(p);

	p->state = BR_STATE_DISABLED;

	p->state = BR_STATE_DISABLED;

	br_stp_port_timer_init(p);

	br_stp_port_timer_init(p);

net/bridge/br_input.c

+4 −2
Original line number Original line Diff line number Diff line
@@ -75,6 +75,7 @@ int br_handle_frame_finish(struct sk_buff *skb) 




	/* insert into forwarding database after filtering to avoid spoofing */

	/* insert into forwarding database after filtering to avoid spoofing */

	br = p->br;

	br = p->br;

	if (p->flags & BR_LEARNING)

		br_fdb_update(br, p, eth_hdr(skb)->h_source, vid);

		br_fdb_update(br, p, eth_hdr(skb)->h_source, vid);





	if (!is_broadcast_ether_addr(dest) && is_multicast_ether_addr(dest) &&

	if (!is_broadcast_ether_addr(dest) && is_multicast_ether_addr(dest) &&
@@ -142,6 +143,7 @@ static int br_handle_local_finish(struct sk_buff *skb) 
	u16 vid = 0;

	u16 vid = 0;





	br_vlan_get_tag(skb, &vid);

	br_vlan_get_tag(skb, &vid);

	if (p->flags & BR_LEARNING)

		br_fdb_update(p->br, p, eth_hdr(skb)->h_source, vid);

		br_fdb_update(p->br, p, eth_hdr(skb)->h_source, vid);

	return 0;	 /* process further */

	return 0;	 /* process further */

}

}

net/bridge/br_netlink.c

+5 −1
Original line number Original line Diff line number Diff line
@@ -30,6 +30,7 @@ static inline size_t br_port_info_size(void) 
		+ nla_total_size(1)	/* IFLA_BRPORT_GUARD */

		+ nla_total_size(1)	/* IFLA_BRPORT_GUARD */

		+ nla_total_size(1)	/* IFLA_BRPORT_PROTECT */

		+ nla_total_size(1)	/* IFLA_BRPORT_PROTECT */

		+ nla_total_size(1)	/* IFLA_BRPORT_FAST_LEAVE */

		+ nla_total_size(1)	/* IFLA_BRPORT_FAST_LEAVE */

		+ nla_total_size(1)	/* IFLA_BRPORT_LEARNING */

		+ 0;

		+ 0;

}

}
@@ -56,7 +57,8 @@ static int br_port_fill_attrs(struct sk_buff *skb, 
	    nla_put_u8(skb, IFLA_BRPORT_MODE, mode) ||

	    nla_put_u8(skb, IFLA_BRPORT_MODE, mode) ||

	    nla_put_u8(skb, IFLA_BRPORT_GUARD, !!(p->flags & BR_BPDU_GUARD)) ||

	    nla_put_u8(skb, IFLA_BRPORT_GUARD, !!(p->flags & BR_BPDU_GUARD)) ||

	    nla_put_u8(skb, IFLA_BRPORT_PROTECT, !!(p->flags & BR_ROOT_BLOCK)) ||

	    nla_put_u8(skb, IFLA_BRPORT_PROTECT, !!(p->flags & BR_ROOT_BLOCK)) ||

	    nla_put_u8(skb, IFLA_BRPORT_FAST_LEAVE, !!(p->flags & BR_MULTICAST_FAST_LEAVE)))

	    nla_put_u8(skb, IFLA_BRPORT_FAST_LEAVE, !!(p->flags & BR_MULTICAST_FAST_LEAVE)) ||

	    nla_put_u8(skb, IFLA_BRPORT_LEARNING, !!(p->flags & BR_LEARNING)))

		return -EMSGSIZE;

		return -EMSGSIZE;





	return 0;

	return 0;
@@ -281,6 +283,7 @@ static const struct nla_policy ifla_brport_policy[IFLA_BRPORT_MAX + 1] = { 
	[IFLA_BRPORT_MODE]	= { .type = NLA_U8 },

	[IFLA_BRPORT_MODE]	= { .type = NLA_U8 },

	[IFLA_BRPORT_GUARD]	= { .type = NLA_U8 },

	[IFLA_BRPORT_GUARD]	= { .type = NLA_U8 },

	[IFLA_BRPORT_PROTECT]	= { .type = NLA_U8 },

	[IFLA_BRPORT_PROTECT]	= { .type = NLA_U8 },

	[IFLA_BRPORT_LEARNING]	= { .type = NLA_U8 },

};

};





/* Change the state of the port and notify spanning tree */

/* Change the state of the port and notify spanning tree */
@@ -328,6 +331,7 @@ static int br_setport(struct net_bridge_port *p, struct nlattr *tb[]) 
	br_set_port_flag(p, tb, IFLA_BRPORT_GUARD, BR_BPDU_GUARD);

	br_set_port_flag(p, tb, IFLA_BRPORT_GUARD, BR_BPDU_GUARD);

	br_set_port_flag(p, tb, IFLA_BRPORT_FAST_LEAVE, BR_MULTICAST_FAST_LEAVE);

	br_set_port_flag(p, tb, IFLA_BRPORT_FAST_LEAVE, BR_MULTICAST_FAST_LEAVE);

	br_set_port_flag(p, tb, IFLA_BRPORT_PROTECT, BR_ROOT_BLOCK);

	br_set_port_flag(p, tb, IFLA_BRPORT_PROTECT, BR_ROOT_BLOCK);

	br_set_port_flag(p, tb, IFLA_BRPORT_LEARNING, BR_LEARNING);





	if (tb[IFLA_BRPORT_COST]) {

	if (tb[IFLA_BRPORT_COST]) {

		err = br_stp_set_path_cost(p, nla_get_u32(tb[IFLA_BRPORT_COST]));

		err = br_stp_set_path_cost(p, nla_get_u32(tb[IFLA_BRPORT_COST]));

net/bridge/br_private.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -158,6 +158,7 @@ struct net_bridge_port 
#define BR_ROOT_BLOCK		0x00000004

#define BR_ROOT_BLOCK		0x00000004

#define BR_MULTICAST_FAST_LEAVE	0x00000008

#define BR_MULTICAST_FAST_LEAVE	0x00000008

#define BR_ADMIN_COST		0x00000010

#define BR_ADMIN_COST		0x00000010

#define BR_LEARNING		0x00000020





#ifdef CONFIG_BRIDGE_IGMP_SNOOPING

#ifdef CONFIG_BRIDGE_IGMP_SNOOPING

	u32				multicast_startup_queries_sent;

	u32				multicast_startup_queries_sent;