diff options
| author | David S. Miller <davem@davemloft.net> | 2020-06-23 14:38:05 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-06-23 14:38:05 -0700 |
| commit | f7fb92acd9e5606f6666bb0f9a7240002a6b3ff0 (patch) | |
| tree | 20a600442e4e86d13643d03771909596ce875f31 /include/uapi/linux | |
| parent | 26ac10be3c80a26d03c950b7387c4b9566c260b6 (diff) | |
| parent | 7882c895b71b8cd6c81946fcc8e13d15a2841de7 (diff) | |
| download | cachepc-linux-f7fb92acd9e5606f6666bb0f9a7240002a6b3ff0.tar.gz cachepc-linux-f7fb92acd9e5606f6666bb0f9a7240002a6b3ff0.zip | |
Merge branch 'bridge-mrp-Update-MRP_PORT_ROLE'
Horatiu Vultur says:
====================
bridge: mrp: Update MRP_PORT_ROLE
This patch series does the following:
- fixes the enum br_mrp_port_role_type. It removes the port role none(0x2)
because this is in conflict with the standard. The standard defines the
interconnect port role as value 0x2.
- adds checks regarding current defined port roles: primary(0x0) and
secondary(0x1).
v2:
- add the validation code when setting the port role.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/uapi/linux')
| -rw-r--r-- | include/uapi/linux/mrp_bridge.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/uapi/linux/mrp_bridge.h b/include/uapi/linux/mrp_bridge.h index 84f15f48a7cb..bee366540212 100644 --- a/include/uapi/linux/mrp_bridge.h +++ b/include/uapi/linux/mrp_bridge.h @@ -36,7 +36,6 @@ enum br_mrp_port_state_type { enum br_mrp_port_role_type { BR_MRP_PORT_ROLE_PRIMARY, BR_MRP_PORT_ROLE_SECONDARY, - BR_MRP_PORT_ROLE_NONE, }; enum br_mrp_tlv_header_type { |