patch 'net/iavf: fix L3 checksum Tx offload flag' has been queued to stable release 21.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.3

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

Thanks.

Kevin

---
>From 301e4cc87b15205000b44b2dc42725e3b2b9b952 Mon Sep 17 00:00:00 2001
From: Ke Zhang <ke1x.zhang at intel.com>
Date: Wed, 10 Aug 2022 17:57:07 +0800
Subject: [PATCH] net/iavf: fix L3 checksum Tx offload flag

[ upstream commit 817577c03afe7590b3212383e4e690e66d266e3f ]

When ol_flag is only RTE_MBUF_F_TX_IPV4, the Tx L3
checksum offload is still configured to IIPT in the
command field of Tx data descriptor.

This patch is to fix the issue to make the Tx L3
checksum offload flags and Tx data descriptor
consistent.

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

Signed-off-by: Ke Zhang <ke1x.zhang at intel.com>
Acked-by: Qi Zhang <qi.z.zhang at intel.com>
---
 drivers/net/iavf/iavf_rxtx.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/drivers/net/iavf/iavf_rxtx.c b/drivers/net/iavf/iavf_rxtx.c
index 3a0dfca2a7..285aeebff6 100644
--- a/drivers/net/iavf/iavf_rxtx.c
+++ b/drivers/net/iavf/iavf_rxtx.c
@@ -2427,7 +2427,9 @@ iavf_build_data_desc_cmd_offset_fields(volatile uint64_t *qw1,
 
 	/* Enable L3 checksum offloading inner */
-	if (m->ol_flags & (RTE_MBUF_F_TX_IP_CKSUM | RTE_MBUF_F_TX_IPV4)) {
-		command |= IAVF_TX_DESC_CMD_IIPT_IPV4_CSUM;
-		offset |= (m->l3_len >> 2) << IAVF_TX_DESC_LENGTH_IPLEN_SHIFT;
+	if (m->ol_flags & RTE_MBUF_F_TX_IP_CKSUM) {
+		if (m->ol_flags & RTE_MBUF_F_TX_IPV4) {
+			command |= IAVF_TX_DESC_CMD_IIPT_IPV4_CSUM;
+			offset |= (m->l3_len >> 2) << IAVF_TX_DESC_LENGTH_IPLEN_SHIFT;
+		}
 	} else if (m->ol_flags & RTE_MBUF_F_TX_IPV4) {
 		command |= IAVF_TX_DESC_CMD_IIPT_IPV4;
-- 
2.37.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-10-25 14:18:59.512958095 +0100
+++ 0043-net-iavf-fix-L3-checksum-Tx-offload-flag.patch	2022-10-25 14:18:58.407798077 +0100
@@ -1 +1 @@
-From 817577c03afe7590b3212383e4e690e66d266e3f Mon Sep 17 00:00:00 2001
+From 301e4cc87b15205000b44b2dc42725e3b2b9b952 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 817577c03afe7590b3212383e4e690e66d266e3f ]
+
@@ -15 +16,0 @@
-Cc: stable at dpdk.org
@@ -24 +25 @@
-index 109ba756f8..dfd021889e 100644
+index 3a0dfca2a7..285aeebff6 100644
@@ -27 +28 @@
-@@ -2539,7 +2539,9 @@ iavf_build_data_desc_cmd_offset_fields(volatile uint64_t *qw1,
+@@ -2427,7 +2427,9 @@ iavf_build_data_desc_cmd_offset_fields(volatile uint64_t *qw1,