Hi, > -----Original Message----- > From: dev <dev-boun...@dpdk.org> On Behalf Of Xiaoyu Min > Sent: Wednesday, November 13, 2019 11:30 AM > To: Matan Azrad <ma...@mellanox.com>; Shahaf Shuler > <shah...@mellanox.com>; Slava Ovsiienko <viachesl...@mellanox.com> > Cc: dev@dpdk.org; Ori Kam <or...@mellanox.com> > Subject: [dpdk-dev] [PATCH] net/mlx5: fix layer bits not unique > > The layer bits should be unique otherwise layer info will be > interpreted wrongly. > > Fixes: 70d84dc797b7 ("net/mlx5: add internal tag item and action") > Cc: or...@mellanox.com > > Fixes: 55deee1715f0 ("net/mlx5: extend flow mark support") > Cc: viachesl...@mellanox.com > > Signed-off-by: Xiaoyu Min <jack...@mellanox.com> > --- > drivers/net/mlx5/mlx5_flow.h | 16 ++++++++-------- > 1 file changed, 8 insertions(+), 8 deletions(-) > > diff --git a/drivers/net/mlx5/mlx5_flow.h b/drivers/net/mlx5/mlx5_flow.h > index 998da61490..3fff5dd7da 100644 > --- a/drivers/net/mlx5/mlx5_flow.h > +++ b/drivers/net/mlx5/mlx5_flow.h > @@ -109,18 +109,18 @@ enum mlx5_feature_name { > #define MLX5_FLOW_ITEM_MARK (1u << 19) > > /* Pattern MISC bits. */ > -#define MLX5_FLOW_LAYER_ICMP (1u << 19) > -#define MLX5_FLOW_LAYER_ICMP6 (1u << 20) > -#define MLX5_FLOW_LAYER_GRE_KEY (1u << 21) > +#define MLX5_FLOW_LAYER_ICMP (1u << 20) > +#define MLX5_FLOW_LAYER_ICMP6 (1u << 21) > +#define MLX5_FLOW_LAYER_GRE_KEY (1u << 22) > > /* Pattern tunnel Layer bits (continued). */ > -#define MLX5_FLOW_LAYER_IPIP (1u << 21) > -#define MLX5_FLOW_LAYER_IPV6_ENCAP (1u << 22) > -#define MLX5_FLOW_LAYER_NVGRE (1u << 23) > -#define MLX5_FLOW_LAYER_GENEVE (1u << 24) > +#define MLX5_FLOW_LAYER_IPIP (1u << 23) > +#define MLX5_FLOW_LAYER_IPV6_ENCAP (1u << 24) > +#define MLX5_FLOW_LAYER_NVGRE (1u << 25) > +#define MLX5_FLOW_LAYER_GENEVE (1u << 26) > > /* Queue items. */ > -#define MLX5_FLOW_ITEM_TX_QUEUE (1u << 25) > +#define MLX5_FLOW_ITEM_TX_QUEUE (1u << 27) > > /* Outer Masks. */ > #define MLX5_FLOW_LAYER_OUTER_L3 \ > -- > 2.24.0.rc0.3.g12a4aeaad8
Patch applied to next-net-mlx, Kindest regards, Raslan Darawsheh