From: Nikolay Aleksandrov Date: Fri, 24 Jan 2020 11:40:19 +0000 (+0200) Subject: net: bridge: check port state before br_allowed_egress X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=ac0e932d0e2988c125be251715d83e95839cdae3;p=linux.git 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 Signed-off-by: David S. Miller --- diff --git a/net/bridge/br_forward.c b/net/bridge/br_forward.c index 86637000f275d..7629b63f6f303 100644 --- a/net/bridge/br_forward.c +++ b/net/bridge/br_forward.c @@ -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); }