Commit 50f6c3d5 authored by Petr Machata's avatar Petr Machata Committed by David S. Miller
Browse files

mlxsw: spectrum_router: mlxsw_sp_router_fini(): Extract a helper variable 



Make mlxsw_sp_router_fini() more similar to the _init() function (and more
concise) by extracting the `router' handle to a named variable and using
that throughout. The availability of a dedicated `router' variable will
come in handy in following patches.

Signed-off-by: default avatarPetr Machata <petrm@nvidia.com>
Reviewed-by: default avatarAmit Cohen <amcohen@nvidia.com>
Reviewed-by: default avatarSimon Horman <simon.horman@corigine.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e069ba07

drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c

+13 −12
Original line number Diff line number Diff line
@@ -10664,15 +10664,16 @@ int mlxsw_sp_router_init(struct mlxsw_sp *mlxsw_sp, 


void mlxsw_sp_router_fini(struct mlxsw_sp *mlxsw_sp)

{

	struct mlxsw_sp_router *router = mlxsw_sp->router;



	unregister_netdevice_notifier_net(mlxsw_sp_net(mlxsw_sp),

					  &mlxsw_sp->router->netdevice_nb);

	unregister_fib_notifier(mlxsw_sp_net(mlxsw_sp),

				&mlxsw_sp->router->fib_nb);

					  &router->netdevice_nb);

	unregister_fib_notifier(mlxsw_sp_net(mlxsw_sp), &router->fib_nb);

	unregister_nexthop_notifier(mlxsw_sp_net(mlxsw_sp),

				    &mlxsw_sp->router->nexthop_nb);

	unregister_netevent_notifier(&mlxsw_sp->router->netevent_nb);

	unregister_inet6addr_notifier(&mlxsw_sp->router->inet6addr_nb);

	unregister_inetaddr_notifier(&mlxsw_sp->router->inetaddr_nb);

				    &router->nexthop_nb);

	unregister_netevent_notifier(&router->netevent_nb);

	unregister_inet6addr_notifier(&router->inet6addr_nb);

	unregister_inetaddr_notifier(&router->inetaddr_nb);

	mlxsw_core_flush_owq();

	mlxsw_sp_mp_hash_fini(mlxsw_sp);

	mlxsw_sp_neigh_fini(mlxsw_sp);
@@ -10680,12 +10681,12 @@ void mlxsw_sp_router_fini(struct mlxsw_sp *mlxsw_sp) 
	mlxsw_sp_vrs_fini(mlxsw_sp);

	mlxsw_sp_mr_fini(mlxsw_sp);

	mlxsw_sp_lpm_fini(mlxsw_sp);

	rhashtable_destroy(&mlxsw_sp->router->nexthop_group_ht);

	rhashtable_destroy(&mlxsw_sp->router->nexthop_ht);

	rhashtable_destroy(&router->nexthop_group_ht);

	rhashtable_destroy(&router->nexthop_ht);

	mlxsw_sp_ipips_fini(mlxsw_sp);

	mlxsw_sp_rifs_fini(mlxsw_sp);

	__mlxsw_sp_router_fini(mlxsw_sp);

	cancel_delayed_work_sync(&mlxsw_sp->router->nh_grp_activity_dw);

	mutex_destroy(&mlxsw_sp->router->lock);

	kfree(mlxsw_sp->router);

	cancel_delayed_work_sync(&router->nh_grp_activity_dw);

	mutex_destroy(&router->lock);

	kfree(router);

}