patch 'app/testpmd: fix GTP PSC raw processing' has been queued to stable release 21.11.2

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.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 06/30/22. 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/kevintraynor/dpdk-stable

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable/commit/44dad33c767065893b3e5afcddcaea444e162258

Thanks.

Kevin

---
>From 44dad33c767065893b3e5afcddcaea444e162258 Mon Sep 17 00:00:00 2001
From: Gregory Etelson <getelson at nvidia.com>
Date: Thu, 16 Jun 2022 21:01:04 +0300
Subject: [PATCH] app/testpmd: fix GTP PSC raw processing

[ upstream commit c65282c9aa31ff0cae4ff7030ac5e56a98b2d711 ]

Use generic GTP PSC header definition in raw handler.

Fixes: 9213c50e36fa ("app/testpmd: support GTP PSC option in raw sets")

Signed-off-by: Gregory Etelson <getelson at nvidia.com>
Reviewed-by: Viacheslav Ovsiienko <viacheslavo at nvidia.com>
Acked-by: Aman Singh <aman.deep.singh at intel.com>
---
 app/test-pmd/cmdline_flow.c | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c
index ce57e409df..e21e0326d9 100644
--- a/app/test-pmd/cmdline_flow.c
+++ b/app/test-pmd/cmdline_flow.c
@@ -9210,17 +9210,11 @@ cmd_set_raw_parsed(const struct buffer *in)
 				const struct rte_flow_item_gtp_psc
 					*opt = item->spec;
-				struct {
-					uint8_t len;
-					uint8_t pdu_type:4;
-					uint8_t qfi:6;
-					uint8_t next;
-				} psc;
-				psc.len = sizeof(psc) / 4;
-				psc.pdu_type = opt->hdr.type;
-				psc.qfi = opt->hdr.qfi;
-				psc.next = 0;
-				*total_size += sizeof(psc);
-				rte_memcpy(data_tail - (*total_size),
-					   &psc, sizeof(psc));
+				struct rte_gtp_psc_generic_hdr *hdr;
+
+				*total_size += RTE_ALIGN(sizeof(hdr),
+							 sizeof(int32_t));
+				hdr = (typeof(hdr))(data_tail - (*total_size));
+				*hdr = opt->hdr;
+				hdr->ext_hdr_len = 1;
 				gtp_psc = i;
 				size = 0;
-- 
2.34.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-06-28 16:18:04.312599302 +0100
+++ 0012-app-testpmd-fix-GTP-PSC-raw-processing.patch	2022-06-28 16:18:04.019387176 +0100
@@ -1 +1 @@
-From c65282c9aa31ff0cae4ff7030ac5e56a98b2d711 Mon Sep 17 00:00:00 2001
+From 44dad33c767065893b3e5afcddcaea444e162258 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit c65282c9aa31ff0cae4ff7030ac5e56a98b2d711 ]
+
@@ -9 +10,0 @@
-Cc: stable at dpdk.org
@@ -19 +20 @@
-index cfd55c598d..6cb1173385 100644
+index ce57e409df..e21e0326d9 100644
@@ -22 +23 @@
-@@ -11030,17 +11030,11 @@ cmd_set_raw_parsed(const struct buffer *in)
+@@ -9210,17 +9210,11 @@ cmd_set_raw_parsed(const struct buffer *in)