From 60bc28051811eaab99e6b77d100566c1f4edc8dc Mon Sep 17 00:00:00 2001 From: Gregory Etelson Date: Thu, 11 Nov 2021 18:23:04 +0200 Subject: [PATCH] net/mlx5: fix flex item macro collision Flex item macro definition values duplicated existing connection tracking values. The patch provides new values for flex item macros. Fixes: a23e9b6e3ee9 ("net/mlx5: handle flex item in flows") Signed-off-by: Gregory Etelson Acked-by: Viacheslav Ovsiienko --- drivers/net/mlx5/mlx5_flow.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow.h b/drivers/net/mlx5/mlx5_flow.h index 696d294ca5..1de2f2edb0 100644 --- a/drivers/net/mlx5/mlx5_flow.h +++ b/drivers/net/mlx5/mlx5_flow.h @@ -181,9 +181,9 @@ enum mlx5_feature_name { #define MLX5_FLOW_LAYER_ASO_CT (UINT64_C(1) << 36) /* Flex item */ -#define MLX5_FLOW_ITEM_OUTER_FLEX (UINT64_C(1) << 36) -#define MLX5_FLOW_ITEM_INNER_FLEX (UINT64_C(1) << 37) -#define MLX5_FLOW_ITEM_FLEX_TUNNEL (UINT64_C(1) << 38) +#define MLX5_FLOW_ITEM_OUTER_FLEX (UINT64_C(1) << 37) +#define MLX5_FLOW_ITEM_INNER_FLEX (UINT64_C(1) << 38) +#define MLX5_FLOW_ITEM_FLEX_TUNNEL (UINT64_C(1) << 39) /* Outer Masks. */ #define MLX5_FLOW_LAYER_OUTER_L3 \ -- 2.39.5