diff options
| author | David S. Miller <davem@davemloft.net> | 2020-05-23 02:17:15 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-05-23 02:17:15 +0300 |
| commit | 1e6a705266409e0dbe020ac10107d265b73e5ca9 (patch) | |
| tree | f127f0ca4b86898b7528b157e7bd397b41dafe30 /include | |
| parent | a74707396c9185cbbca0ae0a115b95b5a8b6bfa1 (diff) | |
| parent | 4fb13499d3a0cc74cf9820c052481f0ccda2bb23 (diff) | |
| download | linux-1e6a705266409e0dbe020ac10107d265b73e5ca9.tar.xz | |
Merge branch 'bridge-mrp-Add-br_mrp_unique_ifindex-function'
Horatiu Vultur says:
====================
bridge: mrp: Add br_mrp_unique_ifindex function
This patch series adds small fixes to MRP implementation.
The following are fixed in this patch series:
- now is not allow to add the same port to multiple MRP rings
- remove unused variable
- restore the port state according to the bridge state when the MRP instance
is deleted
v2:
- use rtnl_dereference instead of rcu_dereference in the first patch
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/switchdev.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/net/switchdev.h b/include/net/switchdev.h index ae7aeb0d1f9c..db519957e134 100644 --- a/include/net/switchdev.h +++ b/include/net/switchdev.h @@ -62,7 +62,6 @@ struct switchdev_attr { #if IS_ENABLED(CONFIG_BRIDGE_MRP) u8 mrp_port_state; /* MRP_PORT_STATE */ u8 mrp_port_role; /* MRP_PORT_ROLE */ - u8 mrp_ring_state; /* MRP_RING_STATE */ #endif } u; }; |