Commit 9ed2b4d2 authored by Ido Schimmel's avatar Ido Schimmel Committed by Jakub Kicinski
Browse files

mlxsw: spectrum_router: Consolidate mlxsw_sp_nexthop{4, 6}_type_fini() 



The two functions are identical, so consolidate them to
mlxsw_sp_nexthop_type_fini().

Signed-off-by: default avatarIdo Schimmel <idosch@nvidia.com>
Reviewed-by: default avatarJiri Pirko <jiri@nvidia.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent c181a89a

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

+3 −15
Original line number Diff line number Diff line
@@ -3944,12 +3944,6 @@ static void mlxsw_sp_nexthop_type_fini(struct mlxsw_sp *mlxsw_sp, 
	}

}



static void mlxsw_sp_nexthop4_type_fini(struct mlxsw_sp *mlxsw_sp,

					struct mlxsw_sp_nexthop *nh)

{

	mlxsw_sp_nexthop_type_fini(mlxsw_sp, nh);

}



static int mlxsw_sp_nexthop4_init(struct mlxsw_sp *mlxsw_sp,

				  struct mlxsw_sp_nexthop_group *nh_grp,

				  struct mlxsw_sp_nexthop *nh,
@@ -4001,7 +3995,7 @@ err_nexthop_neigh_init: 
static void mlxsw_sp_nexthop4_fini(struct mlxsw_sp *mlxsw_sp,

				   struct mlxsw_sp_nexthop *nh)

{

	mlxsw_sp_nexthop4_type_fini(mlxsw_sp, nh);

	mlxsw_sp_nexthop_type_fini(mlxsw_sp, nh);

	list_del(&nh->router_list_node);

	mlxsw_sp_nexthop_counter_free(mlxsw_sp, nh);

	mlxsw_sp_nexthop_remove(mlxsw_sp, nh);
@@ -4026,7 +4020,7 @@ static void mlxsw_sp_nexthop4_event(struct mlxsw_sp *mlxsw_sp, 
		mlxsw_sp_nexthop_type_init(mlxsw_sp, nh, fib_nh->fib_nh_dev);

		break;

	case FIB_EVENT_NH_DEL:

		mlxsw_sp_nexthop4_type_fini(mlxsw_sp, nh);

		mlxsw_sp_nexthop_type_fini(mlxsw_sp, nh);

		break;

	}
@@ -5351,12 +5345,6 @@ static bool mlxsw_sp_nexthop6_ipip_type(const struct mlxsw_sp *mlxsw_sp, 
	       mlxsw_sp_netdev_ipip_type(mlxsw_sp, rt->fib6_nh->fib_nh_dev, ret);

}



static void mlxsw_sp_nexthop6_type_fini(struct mlxsw_sp *mlxsw_sp,

					struct mlxsw_sp_nexthop *nh)

{

	mlxsw_sp_nexthop_type_fini(mlxsw_sp, nh);

}



static int mlxsw_sp_nexthop6_init(struct mlxsw_sp *mlxsw_sp,

				  struct mlxsw_sp_nexthop_group *nh_grp,

				  struct mlxsw_sp_nexthop *nh,
@@ -5384,7 +5372,7 @@ static int mlxsw_sp_nexthop6_init(struct mlxsw_sp *mlxsw_sp, 
static void mlxsw_sp_nexthop6_fini(struct mlxsw_sp *mlxsw_sp,

				   struct mlxsw_sp_nexthop *nh)

{

	mlxsw_sp_nexthop6_type_fini(mlxsw_sp, nh);

	mlxsw_sp_nexthop_type_fini(mlxsw_sp, nh);

	list_del(&nh->router_list_node);

	mlxsw_sp_nexthop_counter_free(mlxsw_sp, nh);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE