[dpdk-stable] patch 'app/testpmd: fix MPLSoGRE 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 76f259196183e6f320683410c67ffb0916c9dfb6 Mon Sep 17 00:00:00 2001
From: Dekel Peled <dekelp at mellanox.com>
Date: Tue, 4 Dec 2018 15:52:02 +0200
Subject: [PATCH] app/testpmd: fix MPLSoGRE encapsulation

[ upstream commit da4d923557050aa51b91a3731f3872cdfe43e283 ]

In function cmd_set_mplsogre_encap_parsed(), MPLS label value was
set in mplsogre_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
mplsogre_encap_conf struct, so it is correctly copied to
rte_flow_item_mpls struct.

Fixes: 3e77031be855 ("app/testpmd: add MPLSoGRE 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 8630be6c3..3ddc3e02a 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -15568,8 +15568,7 @@ static void cmd_set_mplsogre_encap_parsed(void *parsed_result,
 	union {
 		uint32_t mplsogre_label;
-		uint8_t label[3];
+		uint8_t label[4];
 	} id = {
-		.mplsogre_label =
-			rte_cpu_to_be_32(res->label) & RTE_BE32(0x00ffffff),
+		.mplsogre_label = rte_cpu_to_be_32(res->label<<12),
 	};
 
@@ -15584,5 +15583,5 @@ static void cmd_set_mplsogre_encap_parsed(void *parsed_result,
 	else
 		return;
-	rte_memcpy(mplsogre_encap_conf.label, &id.label[1], 3);
+	rte_memcpy(mplsogre_encap_conf.label, &id.label, 3);
 	if (mplsogre_encap_conf.select_ipv4) {
 		IPV4_ADDR_TO_UINT(res->ip_src, mplsogre_encap_conf.ipv4_src);
-- 
2.19.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2018-12-14 18:23:18.788132080 +0000
+++ 0019-app-testpmd-fix-MPLSoGRE-encapsulation.patch	2018-12-14 18:23:18.000000000 +0000
@@ -1,8 +1,10 @@
-From da4d923557050aa51b91a3731f3872cdfe43e283 Mon Sep 17 00:00:00 2001
+From 76f259196183e6f320683410c67ffb0916c9dfb6 Mon Sep 17 00:00:00 2001
 From: Dekel Peled <dekelp at mellanox.com>
 Date: Tue, 4 Dec 2018 15:52:02 +0200
 Subject: [PATCH] app/testpmd: fix MPLSoGRE encapsulation
 
+[ upstream commit da4d923557050aa51b91a3731f3872cdfe43e283 ]
+
 In function cmd_set_mplsogre_encap_parsed(), MPLS label value was
 set in mplsogre_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: 3e77031be855 ("app/testpmd: add MPLSoGRE encapsulation")
-Cc: stable at dpdk.org
 
 Signed-off-by: Dekel Peled <dekelp at mellanox.com>
 Acked-by: Ori Kam <orika at mellanox.com>