[dpdk-stable] patch 'app/testpmd: fix MPLS BoS bit default value' 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 aee396975da23be7e57dff09f624aee933c22ce4 Mon Sep 17 00:00:00 2001
From: Saleh Alsouqi <salehals at mellanox.com>
Date: Wed, 21 Nov 2018 14:47:24 +0000
Subject: [PATCH] app/testpmd: fix MPLS BoS bit default value

[ upstream commit 440dbc323e73771511f18b12d3659723ea173648 ]

The Bottom-of-Stack (bos) bit of MPLS indicates
whether its the last MPLS layer (1) or not (0).

Indicating that the encapsulating MPLS is the
last MPLS layer in the packet as the default
behavior is more appropriate since multiple
encapsulation actions is not supported.

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

Signed-off-by: Saleh Alsouqi <salehals at mellanox.com>
Acked-by: Ori Kam <orika at mellanox.com>
---
 app/test-pmd/cmdline_flow.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c
index 23ea7cc82..5c0108fa7 100644
--- a/app/test-pmd/cmdline_flow.c
+++ b/app/test-pmd/cmdline_flow.c
@@ -3809,4 +3809,5 @@ parse_vc_action_mplsogre_encap(struct context *ctx, const struct token *token,
 	memcpy(mpls.label_tc_s, mplsogre_encap_conf.label,
 	       RTE_DIM(mplsogre_encap_conf.label));
+	mpls.label_tc_s[2] |= 0x1;
 	memcpy(header, &mpls, sizeof(mpls));
 	header += sizeof(mpls);
@@ -3999,4 +4000,5 @@ parse_vc_action_mplsoudp_encap(struct context *ctx, const struct token *token,
 	memcpy(mpls.label_tc_s, mplsoudp_encap_conf.label,
 	       RTE_DIM(mplsoudp_encap_conf.label));
+	mpls.label_tc_s[2] |= 0x1;
 	memcpy(header, &mpls, sizeof(mpls));
 	header += sizeof(mpls);
-- 
2.19.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2018-12-14 18:23:18.366381129 +0000
+++ 0005-app-testpmd-fix-MPLS-BoS-bit-default-value.patch	2018-12-14 18:23:18.000000000 +0000
@@ -1,8 +1,10 @@
-From 440dbc323e73771511f18b12d3659723ea173648 Mon Sep 17 00:00:00 2001
+From aee396975da23be7e57dff09f624aee933c22ce4 Mon Sep 17 00:00:00 2001
 From: Saleh Alsouqi <salehals at mellanox.com>
 Date: Wed, 21 Nov 2018 14:47:24 +0000
 Subject: [PATCH] app/testpmd: fix MPLS BoS bit default value
 
+[ upstream commit 440dbc323e73771511f18b12d3659723ea173648 ]
+
 The Bottom-of-Stack (bos) bit of MPLS indicates
 whether its the last MPLS layer (1) or not (0).
 
@@ -14,7 +16,6 @@
 Fixes: 3e77031be855 ("app/testpmd: add MPLSoGRE encapsulation")
 Fixes: 3e77031be855 ("app/testpmd: add MPLSoGRE encapsulation")
 Fixes: a1191d39cb57 ("app/testpmd: add MPLSoUDP encapsulation")
-cc: stable at dpdk.org
 
 Signed-off-by: Saleh Alsouqi <salehals at mellanox.com>
 Acked-by: Ori Kam <orika at mellanox.com>