Skip to content

Commit 88e928b

Browse files
gal-pressmanSaeed Mahameed
authored andcommitted
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 <[email protected]> Reviewed-by: Vlad Buslov <[email protected]> Signed-off-by: Saeed Mahameed <[email protected]>
1 parent 10b49d0 commit 88e928b

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/pedit.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,8 @@ mlx5e_tc_act_pedit_parse_action(struct mlx5e_priv *priv,
4848
struct pedit_headers_action *hdrs,
4949
struct netlink_ext_ack *extack)
5050
{
51-
u8 cmd = (act->id == FLOW_ACTION_MANGLE) ? 0 : 1;
51+
u8 cmd = (act->id == FLOW_ACTION_MANGLE) ? TCA_PEDIT_KEY_EX_CMD_SET :
52+
TCA_PEDIT_KEY_EX_CMD_ADD;
5253
u8 htype = act->mangle.htype;
5354
int err = -EOPNOTSUPP;
5455
u32 mask, val, offset;

drivers/net/ethernet/mellanox/mlx5/core/en_tc.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3195,10 +3195,10 @@ static int offload_pedit_fields(struct mlx5e_priv *priv,
31953195
headers_c = mlx5e_get_match_headers_criteria(*action_flags, &parse_attr->spec);
31963196
headers_v = mlx5e_get_match_headers_value(*action_flags, &parse_attr->spec);
31973197

3198-
set_masks = &hdrs[0].masks;
3199-
add_masks = &hdrs[1].masks;
3200-
set_vals = &hdrs[0].vals;
3201-
add_vals = &hdrs[1].vals;
3198+
set_masks = &hdrs[TCA_PEDIT_KEY_EX_CMD_SET].masks;
3199+
add_masks = &hdrs[TCA_PEDIT_KEY_EX_CMD_ADD].masks;
3200+
set_vals = &hdrs[TCA_PEDIT_KEY_EX_CMD_SET].vals;
3201+
add_vals = &hdrs[TCA_PEDIT_KEY_EX_CMD_ADD].vals;
32023202

32033203
for (i = 0; i < ARRAY_SIZE(fields); i++) {
32043204
bool skip;

0 commit comments

Comments
 (0)