[dpdk-stable] patch 'net/ice: fix TCP checksum offload' has been queued to stable release 19.11.4

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.4

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

Thanks.

Luca Boccassi

---
>From 5d4e7bd58bed63d8c3d13c1e0958ad9515cba0c5 Mon Sep 17 00:00:00 2001
From: Haiyue Wang <haiyue.wang at intel.com>
Date: Tue, 28 Jul 2020 21:42:03 +0800
Subject: [PATCH] net/ice: fix TCP checksum offload

[ upstream commit 2a0c9ae4f646d8325eaaa0cd44b5def34f5a23b3 ]

The L4LEN field of the Descriptor Header Offset for TCP should be the
real length including the TCP options.

Fixes: 17c7d0f9d6a4 ("net/ice: support basic Rx/Tx")

Signed-off-by: Haiyue Wang <haiyue.wang at intel.com>
Acked-by: Qi Zhang <qi.z.zhang at intel.com>
---
 drivers/net/ice/ice_rxtx.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/ice/ice_rxtx.c b/drivers/net/ice/ice_rxtx.c
index 110b38646..bd4a50ab9 100644
--- a/drivers/net/ice/ice_rxtx.c
+++ b/drivers/net/ice/ice_rxtx.c
@@ -2261,7 +2261,7 @@ ice_txd_enable_checksum(uint64_t ol_flags,
 	switch (ol_flags & PKT_TX_L4_MASK) {
 	case PKT_TX_TCP_CKSUM:
 		*td_cmd |= ICE_TX_DESC_CMD_L4T_EOFT_TCP;
-		*td_offset |= (sizeof(struct rte_tcp_hdr) >> 2) <<
+		*td_offset |= (tx_offload.l4_len >> 2) <<
 			      ICE_TX_DESC_LEN_L4_LEN_S;
 		break;
 	case PKT_TX_SCTP_CKSUM:
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-08-06 10:53:16.961148877 +0100
+++ 0030-net-ice-fix-TCP-checksum-offload.patch	2020-08-06 10:53:15.816597718 +0100
@@ -1,13 +1,14 @@
-From 2a0c9ae4f646d8325eaaa0cd44b5def34f5a23b3 Mon Sep 17 00:00:00 2001
+From 5d4e7bd58bed63d8c3d13c1e0958ad9515cba0c5 Mon Sep 17 00:00:00 2001
 From: Haiyue Wang <haiyue.wang at intel.com>
 Date: Tue, 28 Jul 2020 21:42:03 +0800
 Subject: [PATCH] net/ice: fix TCP checksum offload
 
+[ upstream commit 2a0c9ae4f646d8325eaaa0cd44b5def34f5a23b3 ]
+
 The L4LEN field of the Descriptor Header Offset for TCP should be the
 real length including the TCP options.
 
 Fixes: 17c7d0f9d6a4 ("net/ice: support basic Rx/Tx")
-Cc: stable at dpdk.org
 
 Signed-off-by: Haiyue Wang <haiyue.wang at intel.com>
 Acked-by: Qi Zhang <qi.z.zhang at intel.com>
@@ -16,10 +17,10 @@
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/drivers/net/ice/ice_rxtx.c b/drivers/net/ice/ice_rxtx.c
-index cc3139042..ddf6a93fb 100644
+index 110b38646..bd4a50ab9 100644
 --- a/drivers/net/ice/ice_rxtx.c
 +++ b/drivers/net/ice/ice_rxtx.c
-@@ -2234,7 +2234,7 @@ ice_txd_enable_checksum(uint64_t ol_flags,
+@@ -2261,7 +2261,7 @@ ice_txd_enable_checksum(uint64_t ol_flags,
  	switch (ol_flags & PKT_TX_L4_MASK) {
  	case PKT_TX_TCP_CKSUM:
  		*td_cmd |= ICE_TX_DESC_CMD_L4T_EOFT_TCP;