An action naming change is made to describe the action better
and avoid implicit meaning.
Signed-off-by: Itamar Gozlan <igoz...@nvidia.com>
Acked-by: Matan Azrad <ma...@nvidia.com>
---
drivers/net/mlx5/hws/mlx5dr.h | 2 +-
drivers/net/mlx5/hws/mlx5dr_action.c | 16 ++++++++--------
drivers/net/mlx5/hws/mlx5dr_debug.c | 2 +-
drivers/net/mlx5/mlx5_flow_hw.c | 4 ++--
4 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/drivers/net/mlx5/hws/mlx5dr.h b/drivers/net/mlx5/hws/mlx5dr.h
index 7d5af4c9bb..ec2230d136 100644
--- a/drivers/net/mlx5/hws/mlx5dr.h
+++ b/drivers/net/mlx5/hws/mlx5dr.h
@@ -35,7 +35,7 @@ enum mlx5dr_action_type {
MLX5DR_ACTION_TYP_REFORMAT_L2_TO_TNL_L3,
MLX5DR_ACTION_TYP_DROP,
MLX5DR_ACTION_TYP_TIR,
- MLX5DR_ACTION_TYP_FT,
+ MLX5DR_ACTION_TYP_TBL,
MLX5DR_ACTION_TYP_CTR,
MLX5DR_ACTION_TYP_TAG,
MLX5DR_ACTION_TYP_MODIFY_HDR,
diff --git a/drivers/net/mlx5/hws/mlx5dr_action.c
b/drivers/net/mlx5/hws/mlx5dr_action.c
index 851cee8802..74f4e60863 100644
--- a/drivers/net/mlx5/hws/mlx5dr_action.c
+++ b/drivers/net/mlx5/hws/mlx5dr_action.c
@@ -30,7 +30,7 @@ static const uint32_t
action_order_arr[MLX5DR_TABLE_TYPE_MAX][MLX5DR_ACTION_TYP_
BIT(MLX5DR_ACTION_TYP_MODIFY_HDR),
BIT(MLX5DR_ACTION_TYP_REFORMAT_L2_TO_TNL_L2) |
BIT(MLX5DR_ACTION_TYP_REFORMAT_L2_TO_TNL_L3),
- BIT(MLX5DR_ACTION_TYP_FT) |
+ BIT(MLX5DR_ACTION_TYP_TBL) |
BIT(MLX5DR_ACTION_TYP_MISS) |
BIT(MLX5DR_ACTION_TYP_TIR) |
BIT(MLX5DR_ACTION_TYP_DROP) |
@@ -48,7 +48,7 @@ static const uint32_t
action_order_arr[MLX5DR_TABLE_TYPE_MAX][MLX5DR_ACTION_TYP_
BIT(MLX5DR_ACTION_TYP_MODIFY_HDR),
BIT(MLX5DR_ACTION_TYP_REFORMAT_L2_TO_TNL_L2) |
BIT(MLX5DR_ACTION_TYP_REFORMAT_L2_TO_TNL_L3),
- BIT(MLX5DR_ACTION_TYP_FT) |
+ BIT(MLX5DR_ACTION_TYP_TBL) |
BIT(MLX5DR_ACTION_TYP_MISS) |
BIT(MLX5DR_ACTION_TYP_DROP) |
BIT(MLX5DR_ACTION_TYP_DEST_ROOT),
@@ -67,7 +67,7 @@ static const uint32_t
action_order_arr[MLX5DR_TABLE_TYPE_MAX][MLX5DR_ACTION_TYP_
BIT(MLX5DR_ACTION_TYP_MODIFY_HDR),
BIT(MLX5DR_ACTION_TYP_REFORMAT_L2_TO_TNL_L2) |
BIT(MLX5DR_ACTION_TYP_REFORMAT_L2_TO_TNL_L3),
- BIT(MLX5DR_ACTION_TYP_FT) |
+ BIT(MLX5DR_ACTION_TYP_TBL) |
BIT(MLX5DR_ACTION_TYP_MISS) |
BIT(MLX5DR_ACTION_TYP_VPORT) |
BIT(MLX5DR_ACTION_TYP_DROP) |
@@ -275,7 +275,7 @@ int mlx5dr_action_root_build_attr(struct mlx5dr_rule_action
rule_actions[],
action = rule_actions[i].action;
switch (action->type) {
- case MLX5DR_ACTION_TYP_FT:
+ case MLX5DR_ACTION_TYP_TBL:
case MLX5DR_ACTION_TYP_TIR:
attr[i].type = MLX5DV_FLOW_ACTION_DEST_DEVX;
attr[i].obj = action->devx_obj;
@@ -519,7 +519,7 @@ static void mlx5dr_action_fill_stc_attr(struct
mlx5dr_action *action,
attr->modify_header.pattern_id =
action->modify_header.pattern_obj->id;
}
break;
- case MLX5DR_ACTION_TYP_FT:
+ case MLX5DR_ACTION_TYP_TBL:
attr->action_type = MLX5_IFC_STC_ACTION_TYPE_JUMP_TO_FT;
attr->action_offset = MLX5DR_ACTION_OFFSET_HIT;
attr->dest_table_id = obj->id;
@@ -747,7 +747,7 @@ mlx5dr_action_create_dest_table(struct mlx5dr_context *ctx,
return NULL;
}
- action = mlx5dr_action_create_generic(ctx, flags, MLX5DR_ACTION_TYP_FT);
+ action = mlx5dr_action_create_generic(ctx, flags,
MLX5DR_ACTION_TYP_TBL);
if (!action)
return NULL;
@@ -1681,7 +1681,7 @@ static void mlx5dr_action_destroy_hws(struct
mlx5dr_action *action)
case MLX5DR_ACTION_TYP_TAG:
case MLX5DR_ACTION_TYP_DROP:
case MLX5DR_ACTION_TYP_CTR:
- case MLX5DR_ACTION_TYP_FT:
+ case MLX5DR_ACTION_TYP_TBL:
case MLX5DR_ACTION_TYP_REFORMAT_TNL_L2_TO_L2:
case MLX5DR_ACTION_TYP_ASO_METER:
case MLX5DR_ACTION_TYP_ASO_CT:
@@ -2178,7 +2178,7 @@ int mlx5dr_action_template_process(struct
mlx5dr_action_template *at)
switch (action_type[i]) {
case MLX5DR_ACTION_TYP_DROP:
case MLX5DR_ACTION_TYP_TIR:
- case MLX5DR_ACTION_TYP_FT:
+ case MLX5DR_ACTION_TYP_TBL:
case MLX5DR_ACTION_TYP_DEST_ROOT:
case MLX5DR_ACTION_TYP_VPORT:
case MLX5DR_ACTION_TYP_MISS:
diff --git a/drivers/net/mlx5/hws/mlx5dr_debug.c
b/drivers/net/mlx5/hws/mlx5dr_debug.c
index 5064b23b7d..48810142a0 100644
--- a/drivers/net/mlx5/hws/mlx5dr_debug.c
+++ b/drivers/net/mlx5/hws/mlx5dr_debug.c
@@ -12,7 +12,7 @@ const char *mlx5dr_debug_action_type_str[] = {
[MLX5DR_ACTION_TYP_REFORMAT_L2_TO_TNL_L3] = "L2_TO_TNL_L3",
[MLX5DR_ACTION_TYP_DROP] = "DROP",
[MLX5DR_ACTION_TYP_TIR] = "TIR",
- [MLX5DR_ACTION_TYP_FT] = "FT",
+ [MLX5DR_ACTION_TYP_TBL] = "TBL",
[MLX5DR_ACTION_TYP_CTR] = "CTR",
[MLX5DR_ACTION_TYP_TAG] = "TAG",
[MLX5DR_ACTION_TYP_MODIFY_HDR] = "MODIFY_HDR",
diff --git a/drivers/net/mlx5/mlx5_flow_hw.c b/drivers/net/mlx5/mlx5_flow_hw.c
index e1adc081c1..521df9ff40 100644
--- a/drivers/net/mlx5/mlx5_flow_hw.c
+++ b/drivers/net/mlx5/mlx5_flow_hw.c
@@ -4520,7 +4520,7 @@ flow_hw_actions_validate(struct rte_eth_dev *dev,
static enum mlx5dr_action_type mlx5_hw_dr_action_types[] = {
[RTE_FLOW_ACTION_TYPE_MARK] = MLX5DR_ACTION_TYP_TAG,
[RTE_FLOW_ACTION_TYPE_DROP] = MLX5DR_ACTION_TYP_DROP,
- [RTE_FLOW_ACTION_TYPE_JUMP] = MLX5DR_ACTION_TYP_FT,
+ [RTE_FLOW_ACTION_TYPE_JUMP] = MLX5DR_ACTION_TYP_TBL,
[RTE_FLOW_ACTION_TYPE_QUEUE] = MLX5DR_ACTION_TYP_TIR,
[RTE_FLOW_ACTION_TYPE_RSS] = MLX5DR_ACTION_TYP_TIR,
[RTE_FLOW_ACTION_TYPE_VXLAN_ENCAP] =
MLX5DR_ACTION_TYP_REFORMAT_L2_TO_TNL_L2,
@@ -4665,7 +4665,7 @@ flow_hw_dr_actions_template_create(struct
rte_flow_actions_template *at)
action_types[curr_off++] = MLX5DR_ACTION_TYP_ASO_METER;
if (curr_off >= MLX5_HW_MAX_ACTS)
goto err_actions_num;
- action_types[curr_off++] = MLX5DR_ACTION_TYP_FT;
+ action_types[curr_off++] = MLX5DR_ACTION_TYP_TBL;
break;
case RTE_FLOW_ACTION_TYPE_OF_PUSH_VLAN:
type = mlx5_hw_dr_action_types[at->actions[i].type];
--
2.18.1
