patch 'common/cnxk: fix reset of fields' has been queued to stable release 21.11.1

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.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 02/26/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/de6b483f380cb3667a786d17b9cb50c7279dc35a

Thanks.

Kevin

---
>From de6b483f380cb3667a786d17b9cb50c7279dc35a Mon Sep 17 00:00:00 2001
From: Anoob Joseph <anoobj at marvell.com>
Date: Fri, 17 Dec 2021 14:49:46 +0530
Subject: [PATCH] common/cnxk: fix reset of fields

[ upstream commit f7d904e065c3e82e6892d6b7ed765168c591f6f4 ]

Copy DF/DSCP fields would get set based on ipsec_xform in the code
preceding this. Setting it again would cause the options to be reset.

Fixes: 78d03027f2cc ("common/cnxk: add IPsec common code")

Signed-off-by: Anoob Joseph <anoobj at marvell.com>
Acked-by: Akhil Goyal <gakhil at marvell.com>
---
 drivers/common/cnxk/cnxk_security.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/drivers/common/cnxk/cnxk_security.c b/drivers/common/cnxk/cnxk_security.c
index 30562b46e3..787138b059 100644
--- a/drivers/common/cnxk/cnxk_security.c
+++ b/drivers/common/cnxk/cnxk_security.c
@@ -445,8 +445,4 @@ cnxk_ot_ipsec_outb_sa_fill(struct roc_ot_ipsec_outb_sa *sa,
 	}
 
-	/* Default options of DSCP and Flow label/DF */
-	sa->w2.s.dscp_src = ROC_IE_OT_SA_COPY_FROM_SA;
-	sa->w2.s.ipv4_df_src_or_ipv6_flw_lbl_src = ROC_IE_OT_SA_COPY_FROM_SA;
-
 skip_tunnel_info:
 	/* ESN */
-- 
2.34.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-02-21 15:22:45.063479137 +0000
+++ 0018-common-cnxk-fix-reset-of-fields.patch	2022-02-21 15:22:44.043704017 +0000
@@ -1 +1 @@
-From f7d904e065c3e82e6892d6b7ed765168c591f6f4 Mon Sep 17 00:00:00 2001
+From de6b483f380cb3667a786d17b9cb50c7279dc35a Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit f7d904e065c3e82e6892d6b7ed765168c591f6f4 ]
+
@@ -10 +11,0 @@
-Cc: stable at dpdk.org