net: marvell: prestera: Fix deinit sequence for router
Subsystems (3)
PATCH 1/1 net: marvell: prestera: Fix deinit sequence for router
* Add missed call prestera_router_fini in prestera_switch_fini
* Add prestera_router_hw_fini, which verify lists are empty
Fixes 69204174cc5c ("net: marvell: prestera: Add prestera router infra")
Signed-off-by Yevhen Orlov <[email protected]>
--- drivers/net/ethernet/marvell/prestera/prestera_main.c | 1 + drivers/net/ethernet/marvell/prestera/prestera_router.c | 4 ++-- drivers/net/ethernet/marvell/prestera/prestera_router_hw.c | 6 ++++++ drivers/net/ethernet/marvell/prestera/prestera_router_hw.h | 1 + 4 files changed, 10 insertions(+), 2 deletions(-)
drivers/net/ethernet/marvell/prestera/prestera_main.c +1 -0
@@ -982,6 +982,7 @@ static void prestera_switch_fini(struct prestera_switch *sw)prestera_event_handlers_unregister (sw);prestera_rxtx_switch_fini (sw);prestera_switchdev_fini (sw); +prestera_router_fini (sw);prestera_netdev_event_handler_unregister (sw);prestera_hw_switch_fini (sw); }
drivers/net/ethernet/marvell/prestera/prestera_router.c +2 -2
@@ -168,7 +168,7 @@ int prestera_router_init(struct prestera_switch *sw) err_register_inetaddr_notifier:unregister_inetaddr_validator_notifier (&router->inetaddr_valid_nb); err_register_inetaddr_validator_notifier: -/* prestera_router_hw_fini */ +prestera_router_hw_fini (sw); err_router_lib_init:kfree (sw->router);return err;
@@ -178,7 +178,7 @@ void prestera_router_fini(struct prestera_switch *sw) {unregister_inetaddr_notifier (&sw->router->inetaddr_nb);unregister_inetaddr_validator_notifier (&sw->router->inetaddr_valid_nb); -/* router_hw_fini */ +prestera_router_hw_fini (sw);kfree (sw->router); sw->router =NULL ; }
drivers/net/ethernet/marvell/prestera/prestera_router_hw.c +6 -0
@@ -29,6 +29,12 @@ int prestera_router_hw_init(struct prestera_switch *sw)return 0 ; } +void prestera_router_hw_fini (struct prestera_switch *sw) +{ +WARN_ON (!list_empty (&sw->router->vr_list)); +WARN_ON (!list_empty (&sw->router->rif_entry_list)); +} +static struct prestera_vr *__prestera_vr_find (struct prestera_switch *sw,u32 tb_id) {
drivers/net/ethernet/marvell/prestera/prestera_router_hw.h +1 -0
@@ -32,5 +32,6 @@ prestera_rif_entry_create(struct prestera_switch *sw,struct prestera_rif_entry_key *k, u32 tb_id, const unsigned char *addr);int prestera_router_hw_init (struct prestera_switch *sw); +void prestera_router_hw_fini (struct prestera_switch *sw);#endif /* _PRESTERA_ROUTER_HW_H_ */
Signature · 1 line
2.17.1