[dpdk-stable] patch 'app/testpmd: fix MPLSoUDP encapsulation' has been queued to stable release 18.11.1

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 18.11.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/18/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. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Thanks.

Kevin Traynor

---
>From cc3d6b1be508d250b0902c43fe11b30887462501 Mon Sep 17 00:00:00 2001
From: Dekel Peled <dekelp at mellanox.com>
Date: Tue, 4 Dec 2018 15:51:33 +0200
Subject: [PATCH] app/testpmd: fix MPLSoUDP encapsulation

[ upstream commit 0f79b515fef6d4a9243f59eea3f1f29a116a1f74 ]

In function cmd_set_mplsoudp_encap_parsed(), MPLS label value was
set in mplsoudp_encap_conf struct without the required offset.
As a result the value was copied incorrectly into
rte_flow_item_mpls struct.

This patch sets MPLS label value in appropriate location at
mplsoudp_encap_conf struct, so it is correctly copied to
rte_flow_item_mpls struct.

Fixes: a1191d39cb57 ("app/testpmd: add MPLSoUDP encapsulation")

Signed-off-by: Dekel Peled <dekelp at mellanox.com>
Acked-by: Ori Kam <orika at mellanox.com>
---
 app/test-pmd/cmdline.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index 127507410..8630be6c3 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -15805,8 +15805,7 @@ static void cmd_set_mplsoudp_encap_parsed(void *parsed_result,
 	union {
 		uint32_t mplsoudp_label;
-		uint8_t label[3];
+		uint8_t label[4];
 	} id = {
-		.mplsoudp_label =
-			rte_cpu_to_be_32(res->label) & RTE_BE32(0x00ffffff),
+		.mplsoudp_label = rte_cpu_to_be_32(res->label<<12),
 	};
 
@@ -15821,5 +15820,5 @@ static void cmd_set_mplsoudp_encap_parsed(void *parsed_result,
 	else
 		return;
-	rte_memcpy(mplsoudp_encap_conf.label, &id.label[1], 3);
+	rte_memcpy(mplsoudp_encap_conf.label, &id.label, 3);
 	mplsoudp_encap_conf.udp_src = rte_cpu_to_be_16(res->udp_src);
 	mplsoudp_encap_conf.udp_dst = rte_cpu_to_be_16(res->udp_dst);
-- 
2.19.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2018-12-14 18:23:18.747796451 +0000
+++ 0018-app-testpmd-fix-MPLSoUDP-encapsulation.patch	2018-12-14 18:23:18.000000000 +0000
@@ -1,8 +1,10 @@
-From 0f79b515fef6d4a9243f59eea3f1f29a116a1f74 Mon Sep 17 00:00:00 2001
+From cc3d6b1be508d250b0902c43fe11b30887462501 Mon Sep 17 00:00:00 2001
 From: Dekel Peled <dekelp at mellanox.com>
 Date: Tue, 4 Dec 2018 15:51:33 +0200
 Subject: [PATCH] app/testpmd: fix MPLSoUDP encapsulation
 
+[ upstream commit 0f79b515fef6d4a9243f59eea3f1f29a116a1f74 ]
+
 In function cmd_set_mplsoudp_encap_parsed(), MPLS label value was
 set in mplsoudp_encap_conf struct without the required offset.
 As a result the value was copied incorrectly into
@@ -13,7 +15,6 @@
 rte_flow_item_mpls struct.
 
 Fixes: a1191d39cb57 ("app/testpmd: add MPLSoUDP encapsulation")
-Cc: stable at dpdk.org
 
 Signed-off-by: Dekel Peled <dekelp at mellanox.com>
 Acked-by: Ori Kam <orika at mellanox.com>