patch 'net/ice: fix outer L4 checksum in scalar Rx' has been queued to stable release 20.11.6

[Xueming Li]

Hi,

FYI, your patch has been queued to stable release 20.11.6

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/23/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/steevenlee/dpdk

This queued commit can be viewed at:
https://github.com/steevenlee/dpdk/commit/4d11ba721d11f38c3efbd57370b9e6c330b1ccb5

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From 4d11ba721d11f38c3efbd57370b9e6c330b1ccb5 Mon Sep 17 00:00:00 2001
From: Wenjing Qiao <wenjing.qiao at intel.com>
Date: Fri, 27 May 2022 04:09:55 -0400
Subject: [PATCH] net/ice: fix outer L4 checksum in scalar Rx
Cc: Xueming Li <xuemingl at nvidia.com>

[ upstream commit 23e35ac5f9431139590d4a4994b6992ef749f4a1 ]

In scalar datapath, ol_flag shows RTE_MBUF_F_RX_OUTER_L4_CKSUM_UNKNOWN
which is error, therefore fixing this bug.

Fixes: 94005e4640a7 ("net/ice: fix build with 16-byte Rx descriptor")

Signed-off-by: Wenjing Qiao <wenjing.qiao at intel.com>
Reported-by: Xiao Wang <xiao.w.wang at intel.com>
Acked-by: Qi Zhang <qi.z.zhang at intel.com>
---
 drivers/net/ice/ice_rxtx.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/net/ice/ice_rxtx.c b/drivers/net/ice/ice_rxtx.c
index edd21f0401..5f94b4174d 100644
--- a/drivers/net/ice/ice_rxtx.c
+++ b/drivers/net/ice/ice_rxtx.c
@@ -1446,7 +1446,9 @@ ice_rxd_error_to_pkt_flags(uint16_t stat_err0)
 		return 0;
 
 	if (likely(!(stat_err0 & ICE_RX_FLEX_ERR0_BITS))) {
-		flags |= (PKT_RX_IP_CKSUM_GOOD | PKT_RX_L4_CKSUM_GOOD);
+		flags |= (PKT_RX_IP_CKSUM_GOOD |
+			  PKT_RX_L4_CKSUM_GOOD |
+			  PKT_RX_OUTER_L4_CKSUM_GOOD);
 		return flags;
 	}
 
-- 
2.35.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-06-21 15:37:53.776917359 +0800
+++ 0102-net-ice-fix-outer-L4-checksum-in-scalar-Rx.patch	2022-06-21 15:37:49.217785224 +0800
@@ -1 +1 @@
-From 23e35ac5f9431139590d4a4994b6992ef749f4a1 Mon Sep 17 00:00:00 2001
+From 4d11ba721d11f38c3efbd57370b9e6c330b1ccb5 Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit 23e35ac5f9431139590d4a4994b6992ef749f4a1 ]
@@ -10 +12,0 @@
-Cc: stable at dpdk.org
@@ -20 +22 @@
-index 91cdc560f2..975ab55749 100644
+index edd21f0401..5f94b4174d 100644
@@ -23 +25 @@
-@@ -1497,7 +1497,9 @@ ice_rxd_error_to_pkt_flags(uint16_t stat_err0)
+@@ -1446,7 +1446,9 @@ ice_rxd_error_to_pkt_flags(uint16_t stat_err0)
@@ -27,4 +29,4 @@
--		flags |= (RTE_MBUF_F_RX_IP_CKSUM_GOOD | RTE_MBUF_F_RX_L4_CKSUM_GOOD);
-+		flags |= (RTE_MBUF_F_RX_IP_CKSUM_GOOD |
-+			  RTE_MBUF_F_RX_L4_CKSUM_GOOD |
-+			  RTE_MBUF_F_RX_OUTER_L4_CKSUM_GOOD);
+-		flags |= (PKT_RX_IP_CKSUM_GOOD | PKT_RX_L4_CKSUM_GOOD);
++		flags |= (PKT_RX_IP_CKSUM_GOOD |
++			  PKT_RX_L4_CKSUM_GOOD |
++			  PKT_RX_OUTER_L4_CKSUM_GOOD);