[dpdk-stable] patch 'app/flow-perf: fix encap/decap actions' has been queued to stable release 20.11.2

[Xueming Li]

Hi,

FYI, your patch has been queued to stable release 20.11.2

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/12/21. 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.

Queued patches are on a temporary branch at:
https://github.com/steevenlee/dpdk

This queued commit can be viewed at:
https://github.com/steevenlee/dpdk/commit/2e83b42a993ff104f49282c3943847a876afc598

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From 2e83b42a993ff104f49282c3943847a876afc598 Mon Sep 17 00:00:00 2001
From: Wisam Jaddo <wisamm at nvidia.com>
Date: Sun, 14 Mar 2021 11:54:27 +0200
Subject: [PATCH] app/flow-perf: fix encap/decap actions
Cc: Luca Boccassi <bluca at debian.org>

[ upstream commit 83f9be10f237890587fb7639484ea757c20fdad8 ]

When using decap actions it's been set to the data to decap
into the encap_data instead of decap_data, as a results we end
up with bad encap and decap data in many cases.

Fixes: 0c8f1f4ab90e ("app/flow-perf: support raw encap/decap actions")

Signed-off-by: Wisam Jaddo <wisamm at nvidia.com>
Acked-by: Alexander Kozyrev <akozyrev at nvidia.com>
---
 app/test-flow-perf/main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/test-flow-perf/main.c b/app/test-flow-perf/main.c
index e2fc5b7f65..d25778fd44 100644
--- a/app/test-flow-perf/main.c
+++ b/app/test-flow-perf/main.c
@@ -693,7 +693,7 @@ args_parse(int argc, char **argv)
 					for (i = 0; i < RTE_DIM(flow_options); i++) {
 						if (strcmp(flow_options[i].str, token) == 0) {
 							printf("%s,", token);
-							encap_data |= flow_options[i].mask;
+							decap_data |= flow_options[i].mask;
 							break;
 						}
 						/* Reached last item with no match */
-- 
2.25.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-05-10 23:59:30.835537700 +0800
+++ 0164-app-flow-perf-fix-encap-decap-actions.patch	2021-05-10 23:59:26.610000000 +0800
@@ -1 +1 @@
-From 83f9be10f237890587fb7639484ea757c20fdad8 Mon Sep 17 00:00:00 2001
+From 2e83b42a993ff104f49282c3943847a876afc598 Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Luca Boccassi <bluca at debian.org>
+
+[ upstream commit 83f9be10f237890587fb7639484ea757c20fdad8 ]
@@ -11 +13,0 @@
-Cc: stable at dpdk.org
@@ -20 +22 @@
-index e37a8b7f7a..8e229679df 100644
+index e2fc5b7f65..d25778fd44 100644
@@ -23 +25 @@
-@@ -728,7 +728,7 @@ args_parse(int argc, char **argv)
+@@ -693,7 +693,7 @@ args_parse(int argc, char **argv)