Re: [PATCH net] net: bridge: don't re-arm the STP port timers on MRP driven ports

[Ido Schimmel]

On Mon, Oct 12, 2026 at 04:03:53PM +0800, Jun Yang wrote:
> From: Jun Yang <junvyy...@tencent.com>
> 
> br_set_state() returns without touching p->state when the port is MRP
> aware, so br_stp_disable_port() cannot move such a port to
> BR_STATE_DISABLED.

Why not fix that instead? With something like [1].

Please wait at least 24h before posting another version:

https://docs.kernel.org/next/process/maintainer-netdev.html

[1]
diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c
index c52613431f88..45642b6a5866 100644
--- a/net/bridge/br_if.c
+++ b/net/bridge/br_if.c
@@ -340,13 +340,13 @@ static void del_nbp(struct net_bridge_port *p)
 
        nbp_delete_promisc(p);
 
+       br_mrp_port_del(br, p);
+       br_cfm_port_del(br, p);
+
        spin_lock_bh(&br->lock);
        br_stp_disable_port(p);
        spin_unlock_bh(&br->lock);
 
-       br_mrp_port_del(br, p);
-       br_cfm_port_del(br, p);
-
        br_ifinfo_notify(RTM_DELLINK, NULL, p);
 
        list_del_rcu(&p->list);