Merge tag 'pci-v5.13-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaa...

[linux-2.6-microblaze.git] / net / bridge / br_mrp.c

diff --git a/net/bridge/br_mrp.c b/net/bridge/br_mrp.c
index 12487f6..cd2b1e4 100644 (file)
--- a/net/bridge/br_mrp.c
+++ b/net/bridge/br_mrp.c
@@ -411,6 +411,13 @@ static void br_mrp_del_impl(struct net_bridge *br, struct br_mrp *mrp)
        cancel_delayed_work_sync(&mrp->in_test_work);
        br_mrp_switchdev_send_in_test(br, mrp, 0, 0, 0);
 
+       /* Disable the roles */
+       br_mrp_switchdev_set_ring_role(br, mrp, BR_MRP_RING_ROLE_DISABLED);
+       p = rtnl_dereference(mrp->i_port);
+       if (p)
+               br_mrp_switchdev_set_in_role(br, mrp, mrp->in_id, mrp->ring_id,
+                                            BR_MRP_IN_ROLE_DISABLED);
+
        br_mrp_switchdev_del(br, mrp);
 
        /* Reset the ports */