patch 'net/iavf: fix NAT-T payload length' 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/27/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/362a219f40d67f802a0c9a5c0e72886d6a5be012

Thanks.

Kevin

---
>From 362a219f40d67f802a0c9a5c0e72886d6a5be012 Mon Sep 17 00:00:00 2001
From: Radu Nicolau <radu.nicolau at intel.com>
Date: Wed, 25 May 2022 14:59:12 +0100
Subject: [PATCH] net/iavf: fix NAT-T payload length

[ upstream commit 1d5e6bb6b964674bed75fcf954ea4cd6c796c8e4 ]

Correct the length calculation used for NAT-T

Fixes: 6bc987ecb860 ("net/iavf: support IPsec inline crypto")

Signed-off-by: Radu Nicolau <radu.nicolau at intel.com>
Acked-by: Fan Zhang <roy.fan.zhang at intel.com>
---
 drivers/net/iavf/iavf_ipsec_crypto.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/drivers/net/iavf/iavf_ipsec_crypto.c b/drivers/net/iavf/iavf_ipsec_crypto.c
index fa1cecc1e1..75f05ee558 100644
--- a/drivers/net/iavf/iavf_ipsec_crypto.c
+++ b/drivers/net/iavf/iavf_ipsec_crypto.c
@@ -1119,9 +1119,12 @@ iavf_ipsec_crypto_compute_l4_payload_length(struct rte_mbuf *m,
 		 */
 
-	if (s->udp_encap.enabled)
+	if (s->udp_encap.enabled) {
 		ol4_len = sizeof(struct rte_udp_hdr);
-
-	l3_len = m->l3_len;
-	l4_len = m->l4_len;
+		l3_len = m->l3_len - ol4_len;
+		l4_len = l3_len;
+	} else {
+		l3_len = m->l3_len;
+		l4_len = m->l4_len;
+	}
 
 	return rte_pktmbuf_pkt_len(m) - (ol2_len + ol3_len + ol4_len +
-- 
2.34.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-06-24 15:51:09.255443633 +0100
+++ 0009-net-iavf-fix-NAT-T-payload-length.patch	2022-06-24 15:51:08.850984025 +0100
@@ -1 +1 @@
-From 1d5e6bb6b964674bed75fcf954ea4cd6c796c8e4 Mon Sep 17 00:00:00 2001
+From 362a219f40d67f802a0c9a5c0e72886d6a5be012 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 1d5e6bb6b964674bed75fcf954ea4cd6c796c8e4 ]
+
@@ -9 +10,0 @@
-Cc: stable at dpdk.org