diff options
| author |   David S. Miller <davem@davemloft.net> | 2021-02-10 13:30:12 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-02-10 13:30:12 -0800 |
| commit | dc9d87581d464e7b7d38853d6904b70b6c920d99 (patch) | |
| tree | 15aa27fefb867814899c0a0c194adf327675ba10 /include/net | |
| parent | Merge branch '40GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/next-queue (diff) | |
| parent | Merge tag 'pm-5.11-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm (diff) | |
| download | linux-dev-dc9d87581d464e7b7d38853d6904b70b6c920d99.tar.xz linux-dev-dc9d87581d464e7b7d38853d6904b70b6c920d99.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Diffstat (limited to 'include/net')
| -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 88fcac140966..6dcfc4c51a6e 100644 --- a/include/net/switchdev.h +++ b/include/net/switchdev.h @@ -28,7 +28,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 }; @@ -48,7 +47,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; |