From 7301d1923a7103974077577520511d15420c7407 Mon Sep 17 00:00:00 2001 From: Michael Baum Date: Tue, 21 Jul 2020 12:04:37 +0000 Subject: [PATCH] net/mlx5: fix unnecessary init in mark conversion The flow_dv_convert_action_mark function defines an array of field_modify_info structures and initializes the first entity. In the first entity id field, it initializes to 0, even though its type is an enum that has no value of 0. In fact, the function does not use this id field before assigning the appropriate register id into it, so the initialization is unnecessary. Moreover, this initialization is int into enum, and it would be better not to create a type conflict for no reason. Wait for the first entity initialization until the appropriate register id is already known. Fixes: 55deee1715f0 ("net/mlx5: extend flow mark support") Cc: stable@dpdk.org Signed-off-by: Michael Baum Acked-by: Matan Azrad --- drivers/net/mlx5/mlx5_flow_dv.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index 2ba320d2dd..53399800ff 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -1152,8 +1152,7 @@ flow_dv_convert_action_mark(struct rte_eth_dev *dev, .mask = &mask, }; struct field_modify_info reg_c_x[] = { - {4, 0, 0}, /* dynamic instead of MLX5_MODI_META_REG_C_1. */ - {0, 0, 0}, + [1] = {0, 0, 0}, }; int reg; @@ -1173,7 +1172,7 @@ flow_dv_convert_action_mark(struct rte_eth_dev *dev, mask = rte_cpu_to_be_32(mask) & msk_c0; mask = rte_cpu_to_be_32(mask << shl_c0); } - reg_c_x[0].id = reg_to_field[reg]; + reg_c_x[0] = (struct field_modify_info){4, 0, reg_to_field[reg]}; return flow_dv_convert_modify_action(&item, reg_c_x, NULL, resource, MLX5_MODIFICATION_TYPE_SET, error); } -- 2.20.1