Commit ac0e932d authored Jan 24, 2020 by Nikolay Aleksandrov Committed by David S. Miller Jan 24, 2020

net: bridge: check port state before br_allowed_egress



If we make sure that br_allowed_egress is called only when we have
BR_STATE_FORWARDING state then we can avoid a test later when we add
per-vlan state.

Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 9bbc8be2

net/bridge/br_forward.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -25,7 +25,7 @@ static inline int should_deliver(const struct net_bridge_port *p,

		vg = nbp_vlan_group_rcu(p);
		return ((p->flags & BR_HAIRPIN_MODE) \|\| skb->dev != p->dev) &&
		br_allowed_egress(vg, skb) && p->state == BR_STATE_FORWARDING &&
		p->state == BR_STATE_FORWARDING && br_allowed_egress(vg, skb) &&
		nbp_switchdev_allowed_egress(p, skb) &&
		!br_skb_isolated(p, skb);
		}

Admin message