Commit 424603cc authored by Ido Schimmel's avatar Ido Schimmel Committed by David S. Miller
Browse files

mlxsw: spectrum_router: Rename nexthop update function to reflect its type 



mlxsw_sp_nexthop_update() is used to update the configuration of
Ethernet-type nexthops, as opposed to mlxsw_sp_nexthop_ipip_update(),
which is used to update IPinIP-type nexthops.

Rename the function to mlxsw_sp_nexthop_eth_update(), so that it is
consistent with mlxsw_sp_nexthop_ipip_update().

It will allow us to introduce mlxsw_sp_nexthop_update() in a follow-up
patch, which calls either of above mentioned function based on the
nexthop's type.

Signed-off-by: default avatarIdo Schimmel <idosch@nvidia.com>
Reviewed-by: default avatarPetr Machata <petrm@nvidia.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent fc199d7c

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

+2 −2
Original line number Diff line number Diff line
@@ -1195,7 +1195,7 @@ static int mlxsw_sp_dpipe_table_adj_counters_update(void *priv, bool enable) 
			mlxsw_sp_nexthop_counter_alloc(mlxsw_sp, nh);

		else

			mlxsw_sp_nexthop_counter_free(mlxsw_sp, nh);

		mlxsw_sp_nexthop_update(mlxsw_sp,

		mlxsw_sp_nexthop_eth_update(mlxsw_sp,

					    adj_index + adj_hash_index, nh);

	}

	return 0;

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

+10 −7
Original line number Diff line number Diff line
@@ -3408,7 +3408,8 @@ static int mlxsw_sp_adj_index_mass_update(struct mlxsw_sp *mlxsw_sp, 
	return err;

}



static int __mlxsw_sp_nexthop_update(struct mlxsw_sp *mlxsw_sp, u32 adj_index,

static int __mlxsw_sp_nexthop_eth_update(struct mlxsw_sp *mlxsw_sp,

					 u32 adj_index,

					 struct mlxsw_sp_nexthop *nh)

{

	struct mlxsw_sp_neigh_entry *neigh_entry = nh->neigh_entry;
@@ -3445,7 +3446,7 @@ static int __mlxsw_sp_nexthop_update(struct mlxsw_sp *mlxsw_sp, u32 adj_index, 
	return mlxsw_reg_write(mlxsw_sp->core, MLXSW_REG(ratr), ratr_pl);

}



int mlxsw_sp_nexthop_update(struct mlxsw_sp *mlxsw_sp, u32 adj_index,

int mlxsw_sp_nexthop_eth_update(struct mlxsw_sp *mlxsw_sp, u32 adj_index,

				struct mlxsw_sp_nexthop *nh)

{

	int i;
@@ -3453,7 +3454,8 @@ int mlxsw_sp_nexthop_update(struct mlxsw_sp *mlxsw_sp, u32 adj_index, 
	for (i = 0; i < nh->num_adj_entries; i++) {

		int err;



		err = __mlxsw_sp_nexthop_update(mlxsw_sp, adj_index + i, nh);

		err = __mlxsw_sp_nexthop_eth_update(mlxsw_sp, adj_index + i,

						    nh);

		if (err)

			return err;

	}
@@ -3515,8 +3517,9 @@ mlxsw_sp_nexthop_group_update(struct mlxsw_sp *mlxsw_sp, 
			if (nh->type == MLXSW_SP_NEXTHOP_TYPE_ETH ||

			    nh->action == MLXSW_SP_NEXTHOP_ACTION_DISCARD ||

			    nh->action == MLXSW_SP_NEXTHOP_ACTION_TRAP)

				err = mlxsw_sp_nexthop_update(mlxsw_sp,

							      adj_index, nh);

				err = mlxsw_sp_nexthop_eth_update(mlxsw_sp,

								  adj_index,

								  nh);

			else

				err = mlxsw_sp_nexthop_ipip_update(mlxsw_sp,

								   adj_index,

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

+2 −2
Original line number Diff line number Diff line
@@ -206,7 +206,7 @@ bool mlxsw_sp_nexthop_group_has_ipip(struct mlxsw_sp_nexthop *nh); 
	     nh = mlxsw_sp_nexthop_next(router, nh))

int mlxsw_sp_nexthop_counter_get(struct mlxsw_sp *mlxsw_sp,

				 struct mlxsw_sp_nexthop *nh, u64 *p_counter);

int mlxsw_sp_nexthop_update(struct mlxsw_sp *mlxsw_sp, u32 adj_index,

int mlxsw_sp_nexthop_eth_update(struct mlxsw_sp *mlxsw_sp, u32 adj_index,

				struct mlxsw_sp_nexthop *nh);

void mlxsw_sp_nexthop_counter_alloc(struct mlxsw_sp *mlxsw_sp,

				    struct mlxsw_sp_nexthop *nh);