Commit 4fb13499 authored by Horatiu Vultur's avatar Horatiu Vultur Committed by David S. Miller
Browse files

bridge: mrp: Restore port state when deleting MRP instance 



When a MRP instance is deleted, then restore the port according to the
bridge state. If the bridge is up then the ports will be in forwarding
state otherwise will be in disabled state.

Fixes: 9a9f26e8 ("bridge: mrp: Connect MRP API with the switchdev API")
Acked-by: default avatarNikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: default avatarHoratiu Vultur <horatiu.vultur@microchip.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 89c1e111

net/bridge/br_mrp.c

+9 −4
Original line number Diff line number Diff line
@@ -223,6 +223,7 @@ out: 
static void br_mrp_del_impl(struct net_bridge *br, struct br_mrp *mrp)

{

	struct net_bridge_port *p;

	u8 state;



	/* Stop sending MRP_Test frames */

	cancel_delayed_work_sync(&mrp->test_work);
@@ -234,20 +235,24 @@ static void br_mrp_del_impl(struct net_bridge *br, struct br_mrp *mrp) 
	p = rtnl_dereference(mrp->p_port);

	if (p) {

		spin_lock_bh(&br->lock);

		p->state = BR_STATE_FORWARDING;

		state = netif_running(br->dev) ?

				BR_STATE_FORWARDING : BR_STATE_DISABLED;

		p->state = state;

		p->flags &= ~BR_MRP_AWARE;

		spin_unlock_bh(&br->lock);

		br_mrp_port_switchdev_set_state(p, BR_STATE_FORWARDING);

		br_mrp_port_switchdev_set_state(p, state);

		rcu_assign_pointer(mrp->p_port, NULL);

	}



	p = rtnl_dereference(mrp->s_port);

	if (p) {

		spin_lock_bh(&br->lock);

		p->state = BR_STATE_FORWARDING;

		state = netif_running(br->dev) ?

				BR_STATE_FORWARDING : BR_STATE_DISABLED;

		p->state = state;

		p->flags &= ~BR_MRP_AWARE;

		spin_unlock_bh(&br->lock);

		br_mrp_port_switchdev_set_state(p, BR_STATE_FORWARDING);

		br_mrp_port_switchdev_set_state(p, state);

		rcu_assign_pointer(mrp->s_port, NULL);

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE