net/mlx5e: TC, Add tc prefix to attach/detach hdr functions
authorRoi Dayan <roid@nvidia.com>
Tue, 20 Sep 2022 14:22:21 +0000 (17:22 +0300)
committerSaeed Mahameed <saeedm@nvidia.com>
Wed, 18 Jan 2023 18:34:08 +0000 (10:34 -0800)
Currently there are confusing names for attach/detach functions.

mlx5e_attach_mod_hdr() vs mlx5e_mod_hdr_attach()
mlx5e_detach_mod_hdr() vs mlx5e_mod_hdr_detach()

Add tc prefix to the functions that are in en_tc.c to separate
from the functions in mod_hdr.c which has the mod_hdr prefix.

Signed-off-by: Roi Dayan <roid@nvidia.com>
Reviewed-by: Maor Dickman <maord@nvidia.com>
Signed-off-by: Saeed Mahameed <saeedm@nvidia.com>
drivers/net/ethernet/mellanox/mlx5/core/en_tc.c

index 455c178f41152afd07131f07fa2d998643d8b188..6a15d3e1741efadf1f105b65fbdd51584c75ab8b 100644 (file)
@@ -646,9 +646,9 @@ get_mod_hdr_table(struct mlx5e_priv *priv, struct mlx5e_tc_flow *flow)
                &tc->mod_hdr;
 }
 
-static int mlx5e_attach_mod_hdr(struct mlx5e_priv *priv,
-                               struct mlx5e_tc_flow *flow,
-                               struct mlx5_flow_attr *attr)
+static int mlx5e_tc_attach_mod_hdr(struct mlx5e_priv *priv,
+                                  struct mlx5e_tc_flow *flow,
+                                  struct mlx5_flow_attr *attr)
 {
        struct mlx5e_mod_hdr_handle *mh;
 
@@ -665,9 +665,9 @@ static int mlx5e_attach_mod_hdr(struct mlx5e_priv *priv,
        return 0;
 }
 
-static void mlx5e_detach_mod_hdr(struct mlx5e_priv *priv,
-                                struct mlx5e_tc_flow *flow,
-                                struct mlx5_flow_attr *attr)
+static void mlx5e_tc_detach_mod_hdr(struct mlx5e_priv *priv,
+                                   struct mlx5e_tc_flow *flow,
+                                   struct mlx5_flow_attr *attr)
 {
        /* flow wasn't fully initialized */
        if (!attr->mh)
@@ -1433,7 +1433,7 @@ mlx5e_tc_add_nic_flow(struct mlx5e_priv *priv,
        }
 
        if (attr->action & MLX5_FLOW_CONTEXT_ACTION_MOD_HDR) {
-               err = mlx5e_attach_mod_hdr(priv, flow, attr);
+               err = mlx5e_tc_attach_mod_hdr(priv, flow, attr);
                if (err)
                        return err;
        }
@@ -1493,7 +1493,7 @@ static void mlx5e_tc_del_nic_flow(struct mlx5e_priv *priv,
 
        if (attr->action & MLX5_FLOW_CONTEXT_ACTION_MOD_HDR) {
                mlx5e_mod_hdr_dealloc(&attr->parse_attr->mod_hdr_acts);
-               mlx5e_detach_mod_hdr(priv, flow, attr);
+               mlx5e_tc_detach_mod_hdr(priv, flow, attr);
        }
 
        if (attr->action & MLX5_FLOW_CONTEXT_ACTION_COUNT)
@@ -1928,7 +1928,7 @@ post_process_attr(struct mlx5e_tc_flow *flow,
                        if (err)
                                goto err_out;
                } else {
-                       err = mlx5e_attach_mod_hdr(flow->priv, flow, attr);
+                       err = mlx5e_tc_attach_mod_hdr(flow->priv, flow, attr);
                        if (err)
                                goto err_out;
                }
@@ -2145,7 +2145,7 @@ static void mlx5e_tc_del_fdb_flow(struct mlx5e_priv *priv,
                if (vf_tun && attr->modify_hdr)
                        mlx5_modify_header_dealloc(priv->mdev, attr->modify_hdr);
                else
-                       mlx5e_detach_mod_hdr(priv, flow, attr);
+                       mlx5e_tc_detach_mod_hdr(priv, flow, attr);
        }
 
        if (attr->action & MLX5_FLOW_CONTEXT_ACTION_COUNT)