diff options
| author |   Horatiu Vultur <horatiu.vultur@microchip.com> | 2021-02-06 22:47:33 +0100 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2021-02-08 16:20:57 -0800 |
| commit | b2bdba1cbc84cadb14393d0101a5bfd38d342e0a (patch) | |
| tree | 008b5d113b1f3eee52aa5e78f809956dfd2f871e /net/bridge/br_mrp_switchdev.c | |
| parent | net: watchdog: hold device global xmit lock during tx disable (diff) | |
| download | linux-dev-b2bdba1cbc84cadb14393d0101a5bfd38d342e0a.tar.xz linux-dev-b2bdba1cbc84cadb14393d0101a5bfd38d342e0a.zip | |
bridge: mrp: Fix the usage of br_mrp_port_switchdev_set_state
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>
Diffstat (limited to 'net/bridge/br_mrp_switchdev.c')
| -rw-r--r-- | net/bridge/br_mrp_switchdev.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/net/bridge/br_mrp_switchdev.c b/net/bridge/br_mrp_switchdev.c index ed547e03ace1..75a7e8d0a268 100644 --- a/net/bridge/br_mrp_switchdev.c +++ b/net/bridge/br_mrp_switchdev.c @@ -169,13 +169,12 @@ int br_mrp_switchdev_send_in_test(struct net_bridge *br, struct br_mrp *mrp, return err; } -int br_mrp_port_switchdev_set_state(struct net_bridge_port *p, - enum br_mrp_port_state_type state) +int br_mrp_port_switchdev_set_state(struct net_bridge_port *p, u32 state) { struct switchdev_attr attr = { .orig_dev = p->dev, - .id = SWITCHDEV_ATTR_ID_MRP_PORT_STATE, - .u.mrp_port_state = state, + .id = SWITCHDEV_ATTR_ID_PORT_STP_STATE, + .u.stp_state = state, }; int err; |