net/mlx5: Give esw_offloads_load/unload_rep() "mlx5_" prefix

As esw_offloads_load/unload_rep() are used outside eswitch.c it is nicer
for them to have "mlx5_" prefix. Add it.

Signed-off-by: Jiri Pirko <jiri@nvidia.com>
Reviewed-by: Shay Drory <shayd@nvidia.com>
Signed-off-by: Saeed Mahameed <saeedm@nvidia.com>

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c
index 4b13269..4a7a131 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c
@@ -1077,7 +1077,7 @@ static int mlx5_eswitch_load_vport(struct mlx5_eswitch *esw, u16 vport_num,
        if (err)
                return err;
 
-       err = esw_offloads_load_rep(esw, vport_num);
+       err = mlx5_esw_offloads_load_rep(esw, vport_num);
        if (err)
                goto err_rep;
 
@@ -1090,7 +1090,7 @@ err_rep:
 
 static void mlx5_eswitch_unload_vport(struct mlx5_eswitch *esw, u16 vport_num)
 {
-       esw_offloads_unload_rep(esw, vport_num);
+       mlx5_esw_offloads_unload_rep(esw, vport_num);
        mlx5_esw_vport_disable(esw, vport_num);
 }
 

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.h b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.h
index 837bdd0..2944c92 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.h
@@ -727,8 +727,8 @@ void mlx5_esw_set_spec_source_port(struct mlx5_eswitch *esw,
                                   u16 vport,
                                   struct mlx5_flow_spec *spec);
 
-int esw_offloads_load_rep(struct mlx5_eswitch *esw, u16 vport_num);
-void esw_offloads_unload_rep(struct mlx5_eswitch *esw, u16 vport_num);
+int mlx5_esw_offloads_load_rep(struct mlx5_eswitch *esw, u16 vport_num);
+void mlx5_esw_offloads_unload_rep(struct mlx5_eswitch *esw, u16 vport_num);
 
 int mlx5_eswitch_load_vf_vports(struct mlx5_eswitch *esw, u16 num_vfs,
                                enum mlx5_eswitch_vport_event enabled_events);

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c b/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
index b4df579..f83667b 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
@@ -2425,7 +2425,7 @@ static void mlx5_esw_offloads_rep_unload(struct mlx5_eswitch *esw, u16 vport_num
                __esw_offloads_unload_rep(esw, rep, rep_type);
 }
 
-int esw_offloads_load_rep(struct mlx5_eswitch *esw, u16 vport_num)
+int mlx5_esw_offloads_load_rep(struct mlx5_eswitch *esw, u16 vport_num)
 {
        int err;
 
@@ -2449,7 +2449,7 @@ load_err:
        return err;
 }
 
-void esw_offloads_unload_rep(struct mlx5_eswitch *esw, u16 vport_num)
+void mlx5_esw_offloads_unload_rep(struct mlx5_eswitch *esw, u16 vport_num)
 {
        if (esw->mode != MLX5_ESWITCH_OFFLOADS)
                return;
@@ -3361,7 +3361,7 @@ int esw_offloads_enable(struct mlx5_eswitch *esw)
                        vport->info.link_state = MLX5_VPORT_ADMIN_STATE_DOWN;
 
        /* Uplink vport rep must load first. */
-       err = esw_offloads_load_rep(esw, MLX5_VPORT_UPLINK);
+       err = mlx5_esw_offloads_load_rep(esw, MLX5_VPORT_UPLINK);
        if (err)
                goto err_uplink;
 
@@ -3372,7 +3372,7 @@ int esw_offloads_enable(struct mlx5_eswitch *esw)
        return 0;
 
 err_vports:
-       esw_offloads_unload_rep(esw, MLX5_VPORT_UPLINK);
+       mlx5_esw_offloads_unload_rep(esw, MLX5_VPORT_UPLINK);
 err_uplink:
        esw_offloads_steering_cleanup(esw);
 err_steering_init:
@@ -3410,7 +3410,7 @@ static int esw_offloads_stop(struct mlx5_eswitch *esw,
 void esw_offloads_disable(struct mlx5_eswitch *esw)
 {
        mlx5_eswitch_disable_pf_vf_vports(esw);
-       esw_offloads_unload_rep(esw, MLX5_VPORT_UPLINK);
+       mlx5_esw_offloads_unload_rep(esw, MLX5_VPORT_UPLINK);
        esw_set_passing_vport_metadata(esw, false);
        esw_offloads_steering_cleanup(esw);
        mapping_destroy(esw->offloads.reg_c0_obj_pool);