net: bridge: mrp: Update ring transitions.

[ Upstream commit fcb34635854a5a5814227628867ea914a9805384 ]

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: Horatiu Vultur <horatiu.vultur@microchip.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/net/bridge/br_mrp.c b/net/bridge/br_mrp.c
index 12487f6fe9b481afa98a496201657a2352b486de..58254fbfda858574a80956d5c757a38c447a3165 100644 (file)
--- a/net/bridge/br_mrp.c
+++ b/net/bridge/br_mrp.c
@@ -620,8 +620,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;
@@ -708,8 +707,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;