Commit 64f962c6 authored by Petr Machata's avatar Petr Machata Committed by Jakub Kicinski
Browse files

mlxsw: spectrum_router: Rename two functions 



The function mlxsw_sp_nexthop_counter_alloc() doesn't directly allocate
anything, and mlxsw_sp_nexthop_counter_free() doesn't directly free. For
the following patches, we will need names for functions that actually do
those things. Therefore rename to mlxsw_sp_nexthop_counter_enable() and
mlxsw_sp_nexthop_counter_disable() to free up the namespace.

Signed-off-by: default avatarPetr Machata <petrm@nvidia.com>
Reviewed-by: default avatarIdo Schimmel <idosch@nvidia.com>
Link: https://lore.kernel.org/r/f59272958697a718f090f59f892d32beabcd8972.1709901020.git.petrm@nvidia.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent e99eb57e

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

+2 −2
Original line number Diff line number Diff line
@@ -1193,9 +1193,9 @@ static int mlxsw_sp_dpipe_table_adj_counters_update(void *priv, bool enable) 
		mlxsw_sp_nexthop_indexes(nh, &adj_index, &adj_size,

					 &adj_hash_index);

		if (enable)

			mlxsw_sp_nexthop_counter_alloc(mlxsw_sp, nh);

			mlxsw_sp_nexthop_counter_enable(mlxsw_sp, nh);

		else

			mlxsw_sp_nexthop_counter_free(mlxsw_sp, nh);

			mlxsw_sp_nexthop_counter_disable(mlxsw_sp, nh);

		mlxsw_sp_nexthop_eth_update(mlxsw_sp,

					    adj_index + adj_hash_index, nh,

					    true, ratr_pl);

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

+13 −13
Original line number Diff line number Diff line
@@ -3151,7 +3151,7 @@ struct mlxsw_sp_nexthop_group { 
	bool can_destroy;

};



void mlxsw_sp_nexthop_counter_alloc(struct mlxsw_sp *mlxsw_sp,

void mlxsw_sp_nexthop_counter_enable(struct mlxsw_sp *mlxsw_sp,

				     struct mlxsw_sp_nexthop *nh)

{

	struct devlink *devlink;
@@ -3167,7 +3167,7 @@ void mlxsw_sp_nexthop_counter_alloc(struct mlxsw_sp *mlxsw_sp, 
	nh->counter_valid = true;

}



void mlxsw_sp_nexthop_counter_free(struct mlxsw_sp *mlxsw_sp,

void mlxsw_sp_nexthop_counter_disable(struct mlxsw_sp *mlxsw_sp,

				      struct mlxsw_sp_nexthop *nh)

{

	if (!nh->counter_valid)
@@ -4507,7 +4507,7 @@ static int mlxsw_sp_nexthop4_init(struct mlxsw_sp *mlxsw_sp, 
	if (err)

		return err;



	mlxsw_sp_nexthop_counter_alloc(mlxsw_sp, nh);

	mlxsw_sp_nexthop_counter_enable(mlxsw_sp, nh);

	list_add_tail(&nh->router_list_node, &mlxsw_sp->router->nexthop_list);



	if (!dev)
@@ -4531,7 +4531,7 @@ static int mlxsw_sp_nexthop4_init(struct mlxsw_sp *mlxsw_sp, 


err_nexthop_neigh_init:

	list_del(&nh->router_list_node);

	mlxsw_sp_nexthop_counter_free(mlxsw_sp, nh);

	mlxsw_sp_nexthop_counter_disable(mlxsw_sp, nh);

	mlxsw_sp_nexthop_remove(mlxsw_sp, nh);

	return err;

}
@@ -4541,7 +4541,7 @@ static void mlxsw_sp_nexthop4_fini(struct mlxsw_sp *mlxsw_sp, 
{

	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_counter_disable(mlxsw_sp, nh);

	mlxsw_sp_nexthop_remove(mlxsw_sp, nh);

}
@@ -5006,7 +5006,7 @@ mlxsw_sp_nexthop_obj_init(struct mlxsw_sp *mlxsw_sp, 
		break;

	}



	mlxsw_sp_nexthop_counter_alloc(mlxsw_sp, nh);

	mlxsw_sp_nexthop_counter_enable(mlxsw_sp, nh);

	list_add_tail(&nh->router_list_node, &mlxsw_sp->router->nexthop_list);

	nh->ifindex = dev->ifindex;
@@ -5030,7 +5030,7 @@ mlxsw_sp_nexthop_obj_init(struct mlxsw_sp *mlxsw_sp, 


err_type_init:

	list_del(&nh->router_list_node);

	mlxsw_sp_nexthop_counter_free(mlxsw_sp, nh);

	mlxsw_sp_nexthop_counter_disable(mlxsw_sp, nh);

	return err;

}
@@ -5041,7 +5041,7 @@ static void mlxsw_sp_nexthop_obj_fini(struct mlxsw_sp *mlxsw_sp, 
		mlxsw_sp_nexthop_obj_blackhole_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_counter_disable(mlxsw_sp, nh);

	nh->should_offload = 0;

}
@@ -6734,7 +6734,7 @@ static int mlxsw_sp_nexthop6_init(struct mlxsw_sp *mlxsw_sp, 
#if IS_ENABLED(CONFIG_IPV6)

	nh->neigh_tbl = &nd_tbl;

#endif

	mlxsw_sp_nexthop_counter_alloc(mlxsw_sp, nh);

	mlxsw_sp_nexthop_counter_enable(mlxsw_sp, nh);



	list_add_tail(&nh->router_list_node, &mlxsw_sp->router->nexthop_list);
@@ -6750,7 +6750,7 @@ static int mlxsw_sp_nexthop6_init(struct mlxsw_sp *mlxsw_sp, 


err_nexthop_type_init:

	list_del(&nh->router_list_node);

	mlxsw_sp_nexthop_counter_free(mlxsw_sp, nh);

	mlxsw_sp_nexthop_counter_disable(mlxsw_sp, nh);

	return err;

}
@@ -6759,7 +6759,7 @@ static void mlxsw_sp_nexthop6_fini(struct mlxsw_sp *mlxsw_sp, 
{

	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_counter_disable(mlxsw_sp, nh);

}



static bool mlxsw_sp_rt6_is_gateway(const struct mlxsw_sp *mlxsw_sp,

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

+4 −4
Original line number Diff line number Diff line
@@ -156,9 +156,9 @@ int mlxsw_sp_nexthop_counter_get(struct mlxsw_sp *mlxsw_sp, 
int mlxsw_sp_nexthop_eth_update(struct mlxsw_sp *mlxsw_sp, u32 adj_index,

				struct mlxsw_sp_nexthop *nh, bool force,

				char *ratr_pl);

void mlxsw_sp_nexthop_counter_alloc(struct mlxsw_sp *mlxsw_sp,

void mlxsw_sp_nexthop_counter_enable(struct mlxsw_sp *mlxsw_sp,

				     struct mlxsw_sp_nexthop *nh);

void mlxsw_sp_nexthop_counter_free(struct mlxsw_sp *mlxsw_sp,

void mlxsw_sp_nexthop_counter_disable(struct mlxsw_sp *mlxsw_sp,

				      struct mlxsw_sp_nexthop *nh);



static inline bool mlxsw_sp_l3addr_eq(const union mlxsw_sp_l3addr *addr1,