patch 'net/ice: fix tunnel packet Tx descriptor' has been queued to stable release 21.11.5

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.5

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 07/25/23. 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/48faf86ccf75da1290a06e9fe0b5a15ae435e660

Thanks.

Kevin

---
>From 48faf86ccf75da1290a06e9fe0b5a15ae435e660 Mon Sep 17 00:00:00 2001
From: Shiyang He <shiyangx.he at intel.com>
Date: Thu, 8 Jun 2023 10:19:04 +0000
Subject: [PATCH] net/ice: fix tunnel packet Tx descriptor

[ upstream commit c261e7de45d38ddc3b4b8909c35b448c5e1b0fcf ]

The TX descriptor of tunnel packet filled incorrectly due to the MACLEN
is not set.

This patch fixes this issue by setting MACLEN to correctly fill the
TX descriptor.

Fixes: bd70c451532c ("net/ice: support Tx checksum offload for tunnel")

Signed-off-by: Shiyang He <shiyangx.he at intel.com>
Acked-by: Qi Zhang <qi.z.zhang at intel.com>
---
 drivers/net/ice/ice_rxtx.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/net/ice/ice_rxtx.c b/drivers/net/ice/ice_rxtx.c
index f0d0a58c61..19bc94b6a6 100644
--- a/drivers/net/ice/ice_rxtx.c
+++ b/drivers/net/ice/ice_rxtx.c
@@ -2561,8 +2561,5 @@ ice_txd_enable_checksum(uint64_t ol_flags,
 {
 	/* Set MACLEN */
-	if (ol_flags & RTE_MBUF_F_TX_TUNNEL_MASK)
-		*td_offset |= (tx_offload.outer_l2_len >> 1)
-			<< ICE_TX_DESC_LEN_MACLEN_S;
-	else
+	if (!(ol_flags & RTE_MBUF_F_TX_TUNNEL_MASK))
 		*td_offset |= (tx_offload.l2_len >> 1)
 			<< ICE_TX_DESC_LEN_MACLEN_S;
@@ -2825,7 +2822,10 @@ ice_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)
 		/* Fill in tunneling parameters if necessary */
 		cd_tunneling_params = 0;
-		if (ol_flags & RTE_MBUF_F_TX_TUNNEL_MASK)
+		if (ol_flags & RTE_MBUF_F_TX_TUNNEL_MASK) {
+			td_offset |= (tx_offload.outer_l2_len >> 1)
+				<< ICE_TX_DESC_LEN_MACLEN_S;
 			ice_parse_tunneling_params(ol_flags, tx_offload,
 						   &cd_tunneling_params);
+		}
 
 		/* Enable checksum offloading */
-- 
2.41.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-07-20 16:18:07.119231032 +0100
+++ 0099-net-ice-fix-tunnel-packet-Tx-descriptor.patch	2023-07-20 16:17:55.037752043 +0100
@@ -1 +1 @@
-From c261e7de45d38ddc3b4b8909c35b448c5e1b0fcf Mon Sep 17 00:00:00 2001
+From 48faf86ccf75da1290a06e9fe0b5a15ae435e660 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit c261e7de45d38ddc3b4b8909c35b448c5e1b0fcf ]
+
@@ -13 +14,0 @@
-Cc: stable at dpdk.org
@@ -22 +23 @@
-index 665ae32c13..598edb29c9 100644
+index f0d0a58c61..19bc94b6a6 100644
@@ -25 +26 @@
-@@ -2747,8 +2747,5 @@ ice_txd_enable_checksum(uint64_t ol_flags,
+@@ -2561,8 +2561,5 @@ ice_txd_enable_checksum(uint64_t ol_flags,
@@ -35 +36 @@
-@@ -3011,7 +3008,10 @@ ice_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)
+@@ -2825,7 +2822,10 @@ ice_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)