The 02/16/2021 22:35, Pavel Machek wrote:
Hi,
Hi!
From: Horatiu Vultur horatiu.vultur@microchip.com
commit 059d2a1004981dce19f0127dabc1b4ec927d202a upstream.
Now that MRP started to use also SWITCHDEV_ATTR_ID_PORT_STP_STATE to notify HW, then SWITCHDEV_ATTR_ID_MRP_PORT_STAT is not used anywhere else, therefore we can remove it.
Are you sure this is suitable for 5.10 backport? Unlike mainline, net/bridge use is not removed, so this will cause compile problem...?
pavel@amd:~/cip/krc$ grep -ri SWITCHDEV_ATTR_ID_MRP_PORT_STATE . ./include/net/switchdev.h: SWITCHDEV_ATTR_ID_MRP_PORT_STATE, ./net/bridge/br_mrp_switchdev.c: .id = SWITCHDEV_ATTR_ID_MRP_PORT_STATE, pavel@amd:~/cip/krc$ e ./net/bridge/br_mrp_switchdev.c
The usage of SWITCHDEV_ATTR_ID_MRP_PORT_STATE in net/bridge/br_mrp_switchdev.c is removed in this patch: https://www.spinics.net/lists/stable/msg443626.html
Best regards, Pavel
--- a/include/net/switchdev.h +++ b/include/net/switchdev.h @@ -41,7 +41,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 };
-- DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany