net/mlx5e: Access array with enum values instead of magic numbers

Access the headers array using pedit_cmd enum values, and don't assume
anything about their values.

Signed-off-by: Gal Pressman <gal@nvidia.com>
Reviewed-by: Vlad Buslov <vladbu@nvidia.com>
Signed-off-by: Saeed Mahameed <saeedm@nvidia.com>

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/pedit.c b/drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/pedit.c
index 368a95fa77d3263faa2749c2c33e61ddbbc1aa91..b14cd62edffc5afb69ae579c3ebffe177027cd0e 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/pedit.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/pedit.c
@@ -48,7 +48,8 @@ mlx5e_tc_act_pedit_parse_action(struct mlx5e_priv *priv,
                                struct pedit_headers_action *hdrs,
                                struct netlink_ext_ack *extack)
 {
-       u8 cmd = (act->id == FLOW_ACTION_MANGLE) ? 0 : 1;
+       u8 cmd = (act->id == FLOW_ACTION_MANGLE) ? TCA_PEDIT_KEY_EX_CMD_SET :
+                                                  TCA_PEDIT_KEY_EX_CMD_ADD;
        u8 htype = act->mangle.htype;
        int err = -EOPNOTSUPP;
        u32 mask, val, offset;

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
index 25743a7eda2693e51cefd46306679e5ef1d95a5b..4e1f339e381fd9138bf557545fceb619def793b2 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
@@ -3195,10 +3195,10 @@ static int offload_pedit_fields(struct mlx5e_priv *priv,
        headers_c = mlx5e_get_match_headers_criteria(*action_flags, &parse_attr->spec);
        headers_v = mlx5e_get_match_headers_value(*action_flags, &parse_attr->spec);
 
-       set_masks = &hdrs[0].masks;
-       add_masks = &hdrs[1].masks;
-       set_vals = &hdrs[0].vals;
-       add_vals = &hdrs[1].vals;
+       set_masks = &hdrs[TCA_PEDIT_KEY_EX_CMD_SET].masks;
+       add_masks = &hdrs[TCA_PEDIT_KEY_EX_CMD_ADD].masks;
+       set_vals = &hdrs[TCA_PEDIT_KEY_EX_CMD_SET].vals;
+       add_vals = &hdrs[TCA_PEDIT_KEY_EX_CMD_ADD].vals;
 
        for (i = 0; i < ARRAY_SIZE(fields); i++) {
                bool skip;