[dpdk-stable] patch 'net/dpaa: fix FD offset data type' 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 07/26/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 e240d2dd4f5f0038de94af18424bc4cce2eb1d3d Mon Sep 17 00:00:00 2001
From: Nipun Gupta <nipun.gupta at nxp.com>
Date: Tue, 7 Jul 2020 14:52:17 +0530
Subject: [PATCH] net/dpaa: fix FD offset data type

[ upstream commit 287f4256f9af9291abd1e1f129144cd47eb2d206 ]

On DPAA fd offset is 9 bits, but we are using uint8_t in the
SG case. This patch fixes the same.

Fixes: 8cffdcbe85aa ("net/dpaa: support scattered Rx")

Signed-off-by: Nipun Gupta <nipun.gupta at nxp.com>
Acked-by: Akhil Goyal <akhil.goyal at nxp.com>
Acked-by: Hemant Agrawal <hemant.agrawal at nxp.com>
---
 drivers/net/dpaa/dpaa_rxtx.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/dpaa/dpaa_rxtx.c b/drivers/net/dpaa/dpaa_rxtx.c
index 5dba1db8b..3aeecb7d2 100644
--- a/drivers/net/dpaa/dpaa_rxtx.c
+++ b/drivers/net/dpaa/dpaa_rxtx.c
@@ -305,7 +305,7 @@ dpaa_eth_sg_to_mbuf(const struct qm_fd *fd, uint32_t ifid)
 	struct qm_sg_entry *sgt, *sg_temp;
 	void *vaddr, *sg_vaddr;
 	int i = 0;
-	uint8_t fd_offset = fd->offset;
+	uint16_t fd_offset = fd->offset;
 
 	vaddr = DPAA_MEMPOOL_PTOV(bp_info, qm_fd_addr(fd));
 	if (!vaddr) {
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-07-24 12:53:53.578827580 +0100
+++ 0131-net-dpaa-fix-FD-offset-data-type.patch	2020-07-24 12:53:48.427009068 +0100
@@ -1,13 +1,14 @@
-From 287f4256f9af9291abd1e1f129144cd47eb2d206 Mon Sep 17 00:00:00 2001
+From e240d2dd4f5f0038de94af18424bc4cce2eb1d3d Mon Sep 17 00:00:00 2001
 From: Nipun Gupta <nipun.gupta at nxp.com>
 Date: Tue, 7 Jul 2020 14:52:17 +0530
 Subject: [PATCH] net/dpaa: fix FD offset data type
 
+[ upstream commit 287f4256f9af9291abd1e1f129144cd47eb2d206 ]
+
 On DPAA fd offset is 9 bits, but we are using uint8_t in the
 SG case. This patch fixes the same.
 
 Fixes: 8cffdcbe85aa ("net/dpaa: support scattered Rx")
-Cc: stable at dpdk.org
 
 Signed-off-by: Nipun Gupta <nipun.gupta at nxp.com>
 Acked-by: Akhil Goyal <akhil.goyal at nxp.com>