net/mlx5: fix flex item macro collision

Message ID 20211111162305.10883-1-getelson@nvidia.com (mailing list archive)
State Accepted, archived
Delegated to: Raslan Darawsheh
Headers
Series net/mlx5: fix flex item macro collision |

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/Intel-compilation success Compilation OK
ci/intel-Testing success Testing PASS
ci/github-robot: build success github build: passed
ci/iol-mellanox-Performance success Performance Testing PASS
ci/iol-broadcom-Functional success Functional Testing PASS
ci/iol-broadcom-Performance success Performance Testing PASS
ci/iol-intel-Functional success Functional Testing PASS
ci/iol-aarch64-compile-testing success Testing PASS
ci/iol-aarch64-unit-testing success Testing PASS
ci/iol-x86_64-compile-testing success Testing PASS
ci/iol-x86_64-unit-testing success Testing PASS
ci/iol-intel-Performance success Performance Testing PASS

Commit Message

Gregory Etelson Nov. 11, 2021, 4:23 p.m. UTC
  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 <getelson@nvidia.com>
Acked-by: Viacheslav Ovsiienko <viacheslavo@nvidia.com>
---
 drivers/net/mlx5/mlx5_flow.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
  

Comments

Raslan Darawsheh Nov. 14, 2021, 11:20 a.m. UTC | #1
Hi,
> -----Original Message-----
> From: Gregory Etelson <getelson@nvidia.com>
> Sent: Thursday, November 11, 2021 6:23 PM
> To: dev@dpdk.org; Gregory Etelson <getelson@nvidia.com>; Slava Ovsiienko
> <viacheslavo@nvidia.com>
> Cc: Matan Azrad <matan@nvidia.com>
> 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 <getelson@nvidia.com>
> Acked-by: Viacheslav Ovsiienko <viacheslavo@nvidia.com>

Patch applied to next-net-mlx,
Kindest regards,
Raslan Darawsheh
  

Patch

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 \