[PATCH net-next v1 1/1] net: bridge: ensure that multicast packets cannot unlock a locked port

[Hans Schultz <hans@xxxxxxxxxxxxxxxxxxxx>]

This makes it possible to use the locked port feature with learning
turned on which is needed for various driver features.

Signed-off-by: Hans Schultz <hans@xxxxxxxxxxxxxxxxxxxx>
---
 net/bridge/br_input.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/net/bridge/br_input.c b/net/bridge/br_input.c
index 68b3e850bcb9..a3ce0a151817 100644
--- a/net/bridge/br_input.c
+++ b/net/bridge/br_input.c
@@ -215,6 +215,7 @@ static void __br_handle_local_finish(struct sk_buff *skb)
 	if ((p->flags & BR_LEARNING) &&
 	    nbp_state_should_learn(p) &&
 	    !br_opt_get(p->br, BROPT_NO_LL_LEARN) &&
+	    !(p->flags & BR_PORT_LOCKED) &&
 	    br_should_learn(p, skb, &vid))
 		br_fdb_update(p->br, p, eth_hdr(skb)->h_source, vid, 0);
 }
-- 
2.30.2