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: Ido Schimmel <idosch@nvidia.com>
Reviewed-by: Petr Machata <petrm@nvidia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_dpipe.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_dpipe.c
index 936224d8c2ea9c0cc1670d3df46329da2e4bea3b..af2093fc50258446531ed1b1e12b1c66d45fa43a 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_dpipe.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_dpipe.c
@@ -1195,8 +1195,8 @@ 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,
-                                       adj_index + adj_hash_index, nh);
+               mlxsw_sp_nexthop_eth_update(mlxsw_sp,
+                                           adj_index + adj_hash_index, nh);
        }
        return 0;
 }

diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c
index 50286c6d0a8a9534221da7cbfbafe7806f8ab8ff..1f1f8af63ef75f780f98509c5daf215f6780d45e 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c
@@ -3408,8 +3408,9 @@ err_mass_update_vr:
        return err;
 }
 
-static int __mlxsw_sp_nexthop_update(struct mlxsw_sp *mlxsw_sp, u32 adj_index,
-                                    struct mlxsw_sp_nexthop *nh)
+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;
        char ratr_pl[MLXSW_REG_RATR_LEN];
@@ -3445,15 +3446,16 @@ 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,
-                           struct mlxsw_sp_nexthop *nh)
+int mlxsw_sp_nexthop_eth_update(struct mlxsw_sp *mlxsw_sp, u32 adj_index,
+                               struct mlxsw_sp_nexthop *nh)
 {
        int i;
 
        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,

diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.h b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.h
index 8ecd090a5d8a8d019f82f140584c0c62b70c8e04..3d90d4eaba0575ce4fd8de0da72f28569b67c112 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.h
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.h
@@ -206,8 +206,8 @@ 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,
-                           struct mlxsw_sp_nexthop *nh);
+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);
 void mlxsw_sp_nexthop_counter_free(struct mlxsw_sp *mlxsw_sp,