[dpdk-stable] patch 'net/mlx5: fix packet type for MPLS in UDP' has been queued to stable release 18.08.1

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 18.08.1

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 12/08/18. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the patch applied
to the branch. If the code is different (ie: not only metadata diffs), due for example to
a change in context or macro names, please double check it.

Thanks.

Kevin Traynor

---
>From 21b4aa9fc63305533d85d7cfea96a3fc09fdda28 Mon Sep 17 00:00:00 2001
From: Dekel Peled <dekelp at mellanox.com>
Date: Thu, 15 Nov 2018 17:17:14 +0200
Subject: [PATCH] net/mlx5: fix packet type for MPLS in UDP

[ upstream commit c5e508f0c3f2c1a4cc943f588235dd7be0ab6dba ]

Change the relevant value in tunnels_info[] to match tunnel type.

Fixes: a4a5cd21d20a ("net/mlx5: add flow MPLS item")

Signed-off-by: Dekel Peled <dekelp at mellanox.com>
Acked-by: Shahaf Shuler <shahafs at mellanox.com>
---
 drivers/net/mlx5/mlx5_flow.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c
index 4f21215df..fee6f693e 100644
--- a/drivers/net/mlx5/mlx5_flow.c
+++ b/drivers/net/mlx5/mlx5_flow.c
@@ -402,5 +402,5 @@ static struct mlx5_flow_tunnel_info tunnels_info[] = {
 	{
 		.tunnel = MLX5_FLOW_LAYER_MPLS | MLX5_FLOW_LAYER_OUTER_L4_UDP,
-		.ptype = RTE_PTYPE_TUNNEL_MPLS_IN_GRE | RTE_PTYPE_L4_UDP,
+		.ptype = RTE_PTYPE_TUNNEL_MPLS_IN_UDP | RTE_PTYPE_L4_UDP,
 	},
 	{
-- 
2.19.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2018-11-29 13:11:36.345884547 +0000
+++ 0050-net-mlx5-fix-packet-type-for-MPLS-in-UDP.patch	2018-11-29 13:11:34.000000000 +0000
@@ -1,12 +1,13 @@
-From c5e508f0c3f2c1a4cc943f588235dd7be0ab6dba Mon Sep 17 00:00:00 2001
+From 21b4aa9fc63305533d85d7cfea96a3fc09fdda28 Mon Sep 17 00:00:00 2001
 From: Dekel Peled <dekelp at mellanox.com>
 Date: Thu, 15 Nov 2018 17:17:14 +0200
 Subject: [PATCH] net/mlx5: fix packet type for MPLS in UDP
 
+[ upstream commit c5e508f0c3f2c1a4cc943f588235dd7be0ab6dba ]
+
 Change the relevant value in tunnels_info[] to match tunnel type.
 
 Fixes: a4a5cd21d20a ("net/mlx5: add flow MPLS item")
-Cc: stable at dpdk.org
 
 Signed-off-by: Dekel Peled <dekelp at mellanox.com>
 Acked-by: Shahaf Shuler <shahafs at mellanox.com>
@@ -15,10 +16,10 @@
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c
-index c8fad5f00..97dc3e1f8 100644
+index 4f21215df..fee6f693e 100644
 --- a/drivers/net/mlx5/mlx5_flow.c
 +++ b/drivers/net/mlx5/mlx5_flow.c
-@@ -295,5 +295,5 @@ static struct mlx5_flow_tunnel_info tunnels_info[] = {
+@@ -402,5 +402,5 @@ static struct mlx5_flow_tunnel_info tunnels_info[] = {
  	{
  		.tunnel = MLX5_FLOW_LAYER_MPLS | MLX5_FLOW_LAYER_OUTER_L4_UDP,
 -		.ptype = RTE_PTYPE_TUNNEL_MPLS_IN_GRE | RTE_PTYPE_L4_UDP,