diff options
| author | David S. Miller <[email protected]> | 2021-02-09 00:20:58 +0000 |
|---|---|---|
| committer | David S. Miller <[email protected]> | 2021-02-09 00:20:58 +0000 |
| commit | 6bbc088d6ebfd5a4284641dbe8413ebab0dfeb8c (patch) | |
| tree | 3e51cc659f77932742a2c749a2d9da441806cfb2 /net/bridge/br_mrp_switchdev.c | |
| parent | net: watchdog: hold device global xmit lock during tx disable (diff) | |
| parent | switchdev: mrp: Remove SWITCHDEV_ATTR_ID_MRP_PORT_STAT (diff) | |
| download | kernel-6bbc088d6ebfd5a4284641dbe8413ebab0dfeb8c.tar.gz kernel-6bbc088d6ebfd5a4284641dbe8413ebab0dfeb8c.zip | |
Merge branch 'bridge-mrp'
Horatiu Vultur says:
====================
bridge: mrp: Fix br_mrp_port_switchdev_set_state
Based on the discussion here[1], there was a problem with the function
br_mrp_port_switchdev_set_state. The problem was that it was called
both with BR_STATE* and BR_MRP_PORT_STATE* types. This patch series
fixes this issue and removes SWITCHDEV_ATTR_ID_MRP_PORT_STAT because
is not used anymore.
[1] https://www.spinics.net/lists/netdev/msg714816.html
====================
Signed-off-by: David S. Miller <[email protected]>
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; |