bridge: mrp: Fix the usage of br_mrp_port_switchdev_set_state
authorHoratiu Vultur <horatiu.vultur@microchip.com>
Sat, 6 Feb 2021 21:47:33 +0000 (22:47 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 17 Feb 2021 10:02:29 +0000 (11:02 +0100)
commit55ad30cb7f73b575570f2a39772b88ff25308b27
tree109bdd8892777899f77d0d56dc3469733948d6ea
parente22b963d3ec9a510c44d02ff7262fcec49098533
bridge: mrp: Fix the usage of br_mrp_port_switchdev_set_state

commit b2bdba1cbc84cadb14393d0101a5bfd38d342e0a upstream.

The function br_mrp_port_switchdev_set_state was called both with MRP
port state and STP port state, which is an issue because they don't
match exactly.

Therefore, update the function to be used only with STP port state and
use the id SWITCHDEV_ATTR_ID_PORT_STP_STATE.

The choice of using STP over MRP is that the drivers already implement
SWITCHDEV_ATTR_ID_PORT_STP_STATE and already in SW we update the port
STP state.

Fixes: 9a9f26e8f7ea30 ("bridge: mrp: Connect MRP API with the switchdev API")
Fixes: fadd409136f0f2 ("bridge: switchdev: mrp: Implement MRP API for switchdev")
Fixes: 2f1a11ae11d222 ("bridge: mrp: Add MRP interface.")
Reported-by: Rasmus Villemoes <rasmus.villemoes@prevas.dk>
Signed-off-by: Horatiu Vultur <horatiu.vultur@microchip.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
net/bridge/br_mrp.c
net/bridge/br_mrp_switchdev.c
net/bridge/br_private_mrp.h