patch 'net/iavf: fix segmentation offload condition' 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 03/06/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/dbb1c537251dea2dba61bdf91cb0e74aa408f920

Thanks.

Kevin

---
>From dbb1c537251dea2dba61bdf91cb0e74aa408f920 Mon Sep 17 00:00:00 2001
From: Radu Nicolau <radu.nicolau at intel.com>
Date: Mon, 22 Nov 2021 15:30:00 +0000
Subject: [PATCH] net/iavf: fix segmentation offload condition

[ upstream commit ff8b8bcd2ebef5d951bf442c44a71b0b3a0413c9 ]

Apply segmentation offload when requested for non tunneled
packets e.g. IPsec transport mode.

Fixes: 1e728b01120c ("net/iavf: rework Tx path")

Signed-off-by: Radu Nicolau <radu.nicolau at intel.com>
Reviewed-by: Qi Zhang <qi.z.zhang at intel.com>
---
 drivers/net/iavf/iavf_rxtx.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/drivers/net/iavf/iavf_rxtx.c b/drivers/net/iavf/iavf_rxtx.c
index ba272bb211..b0fed1b992 100644
--- a/drivers/net/iavf/iavf_rxtx.c
+++ b/drivers/net/iavf/iavf_rxtx.c
@@ -2465,8 +2465,7 @@ iavf_fill_data_desc(volatile struct iavf_tx_desc *desc,
 
 	/* calculate data buffer size less set header lengths */
-	if ((m->ol_flags & RTE_MBUF_F_TX_TUNNEL_MASK) &&
-			(m->ol_flags & (RTE_MBUF_F_TX_TCP_SEG |
-					RTE_MBUF_F_TX_UDP_SEG))) {
-		hdrlen += m->outer_l3_len;
+	if (m->ol_flags & (RTE_MBUF_F_TX_TCP_SEG | RTE_MBUF_F_TX_UDP_SEG)) {
+		if (m->ol_flags & RTE_MBUF_F_TX_TUNNEL_MASK)
+			hdrlen += m->outer_l3_len;
 		if (m->ol_flags & RTE_MBUF_F_TX_L4_MASK)
 			hdrlen += m->l3_len + m->l4_len;
-- 
2.34.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-03-01 10:41:03.085602512 +0000
+++ 0062-net-iavf-fix-segmentation-offload-condition.patch	2022-03-01 10:41:01.349244107 +0000
@@ -1 +1 @@
-From ff8b8bcd2ebef5d951bf442c44a71b0b3a0413c9 Mon Sep 17 00:00:00 2001
+From dbb1c537251dea2dba61bdf91cb0e74aa408f920 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit ff8b8bcd2ebef5d951bf442c44a71b0b3a0413c9 ]
+
@@ -10 +11,0 @@
-Cc: stable at dpdk.org
@@ -19 +20 @@
-index 59623ac820..94819e59b2 100644
+index ba272bb211..b0fed1b992 100644
@@ -22 +23 @@
-@@ -2429,8 +2429,7 @@ iavf_fill_data_desc(volatile struct iavf_tx_desc *desc,
+@@ -2465,8 +2465,7 @@ iavf_fill_data_desc(volatile struct iavf_tx_desc *desc,