patch 'net/axgbe: fix mbuf lengths in scattered Rx' has been queued to stable release 20.11.7

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 20.11.7

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/05/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/d5affccf25a85b3c67dd547ae90d3dce3f96b52c

Thanks.

Luca Boccassi

---
>From d5affccf25a85b3c67dd547ae90d3dce3f96b52c Mon Sep 17 00:00:00 2001
From: Bhagyada Modali <bhagyada.modali at amd.com>
Date: Fri, 2 Sep 2022 04:47:52 -0400
Subject: [PATCH] net/axgbe: fix mbuf lengths in scattered Rx

[ upstream commit e73845354abce20ed9677c6519bcbe5a450fecef ]

Updated pkt_len and data_len in the last segment of the packet.

Fixes: 965b3127d425 ("net/axgbe: support scattered Rx")

Signed-off-by: Bhagyada Modali <bhagyada.modali at amd.com>
Acked-by: Chandubabu Namburu <chandu at amd.com>
---
 drivers/net/axgbe/axgbe_rxtx.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/axgbe/axgbe_rxtx.c b/drivers/net/axgbe/axgbe_rxtx.c
index 68270bc3a6..cbcbe0e682 100644
--- a/drivers/net/axgbe/axgbe_rxtx.c
+++ b/drivers/net/axgbe/axgbe_rxtx.c
@@ -371,8 +371,8 @@ next_desc:
 		} else {
 			eop = 1;
 			pkt_len = AXGMAC_GET_BITS_LE(desc->write.desc3,
-					RX_NORMAL_DESC3, PL);
-			data_len = pkt_len - rxq->crc_len;
+					RX_NORMAL_DESC3, PL) - rxq->crc_len;
+			data_len = pkt_len % rxq->buf_size;
 			/* Check for any errors and free mbuf*/
 			err = AXGMAC_GET_BITS_LE(desc->write.desc3,
 					RX_NORMAL_DESC3, ES);
-- 
2.34.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-11-03 09:27:25.943525236 +0000
+++ 0007-net-axgbe-fix-mbuf-lengths-in-scattered-Rx.patch	2022-11-03 09:27:25.305421124 +0000
@@ -1 +1 @@
-From e73845354abce20ed9677c6519bcbe5a450fecef Mon Sep 17 00:00:00 2001
+From d5affccf25a85b3c67dd547ae90d3dce3f96b52c Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit e73845354abce20ed9677c6519bcbe5a450fecef ]
+
@@ -9 +10,0 @@
-Cc: stable at dpdk.org
@@ -18 +19 @@
-index 89ed6fd74a..2c2554e900 100644
+index 68270bc3a6..cbcbe0e682 100644
@@ -21 +22 @@
-@@ -391,8 +391,8 @@ next_desc:
+@@ -371,8 +371,8 @@ next_desc: