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

net: bridge: mrp: Update ring transitions. 



According to the standard IEC 62439-2, the number of transitions needs
to be counted for each transition 'between' ring state open and ring
state closed and not from open state to closed state.

Therefore fix this for both ring and interconnect ring.

Signed-off-by: default avatarHoratiu Vultur <horatiu.vultur@microchip.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ecb06058

net/bridge/br_mrp.c

+2 −4
Original line number Diff line number Diff line
@@ -627,8 +627,7 @@ int br_mrp_set_ring_state(struct net_bridge *br, 
	if (!mrp)

		return -EINVAL;



	if (mrp->ring_state == BR_MRP_RING_STATE_CLOSED &&

	    state->ring_state != BR_MRP_RING_STATE_CLOSED)

	if (mrp->ring_state != state->ring_state)

		mrp->ring_transitions++;



	mrp->ring_state = state->ring_state;
@@ -715,8 +714,7 @@ int br_mrp_set_in_state(struct net_bridge *br, struct br_mrp_in_state *state) 
	if (!mrp)

		return -EINVAL;



	if (mrp->in_state == BR_MRP_IN_STATE_CLOSED &&

	    state->in_state != BR_MRP_IN_STATE_CLOSED)

	if (mrp->in_state != state->in_state)

		mrp->in_transitions++;



	mrp->in_state = state->in_state;