diff options
| author |   David S. Miller <davem@davemloft.net> | 2021-02-08 16:20:58 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-02-08 16:20:58 -0800 |
| commit | 6bbc088d6ebfd5a4284641dbe8413ebab0dfeb8c (patch) | |
| tree | 3e51cc659f77932742a2c749a2d9da441806cfb2 /include | |
| parent | net: watchdog: hold device global xmit lock during tx disable (diff) | |
| parent | switchdev: mrp: Remove SWITCHDEV_ATTR_ID_MRP_PORT_STAT (diff) | |
| download | wireguard-linux-6bbc088d6ebfd5a4284641dbe8413ebab0dfeb8c.tar.xz wireguard-linux-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 <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/switchdev.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/net/switchdev.h b/include/net/switchdev.h index 99cd538d6519..afdf8bd1b4fe 100644 --- a/include/net/switchdev.h +++ b/include/net/switchdev.h @@ -42,7 +42,6 @@ enum switchdev_attr_id { SWITCHDEV_ATTR_ID_BRIDGE_MC_DISABLED, SWITCHDEV_ATTR_ID_BRIDGE_MROUTER, #if IS_ENABLED(CONFIG_BRIDGE_MRP) - SWITCHDEV_ATTR_ID_MRP_PORT_STATE, SWITCHDEV_ATTR_ID_MRP_PORT_ROLE, #endif }; @@ -62,7 +61,6 @@ struct switchdev_attr { u16 vlan_protocol; /* BRIDGE_VLAN_PROTOCOL */ bool mc_disabled; /* MC_DISABLED */ #if IS_ENABLED(CONFIG_BRIDGE_MRP) - u8 mrp_port_state; /* MRP_PORT_STATE */ u8 mrp_port_role; /* MRP_PORT_ROLE */ #endif } u; |