patch 'net/axgbe: remove freeing buffer in scattered Rx' has been queued to stable release 21.11.3
Kevin Traynor
ktraynor at redhat.com
Tue Oct 25 17:06:09 CEST 2022
Hi,
FYI, your patch has been queued to stable release 21.11.3
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/01/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/88eb5f06dd1c4833126fcc91565b2bfb4b5c7d27
Thanks.
Kevin
---
>From 88eb5f06dd1c4833126fcc91565b2bfb4b5c7d27 Mon Sep 17 00:00:00 2001
From: Bhagyada Modali <bhagyada.modali at amd.com>
Date: Thu, 8 Sep 2022 08:42:15 -0400
Subject: [PATCH] net/axgbe: remove freeing buffer in scattered Rx
[ upstream commit e867021dadd7976758b4892cb64b19078a1855e0 ]
Removed freeing of mbuf in scattered Rx as it should not be freed in rx.
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 | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/drivers/net/axgbe/axgbe_rxtx.c b/drivers/net/axgbe/axgbe_rxtx.c
index 7a95a1c437..7bac482e92 100644
--- a/drivers/net/axgbe/axgbe_rxtx.c
+++ b/drivers/net/axgbe/axgbe_rxtx.c
@@ -460,12 +460,9 @@ err_set:
AXGMAC_SET_BITS_LE(desc->read.desc3, RX_NORMAL_DESC3, OWN, 1);
- if (!eop) {
- rte_pktmbuf_free(mbuf);
+ if (!eop)
goto next_desc;
- }
first_seg->pkt_len = pkt_len;
rxq->bytes += pkt_len;
- mbuf->next = NULL;
first_seg->port = rxq->port_id;
--
2.37.3
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2022-10-25 14:18:58.890199468 +0100
+++ 0014-net-axgbe-remove-freeing-buffer-in-scattered-Rx.patch 2022-10-25 14:18:58.363797919 +0100
@@ -1 +1 @@
-From e867021dadd7976758b4892cb64b19078a1855e0 Mon Sep 17 00:00:00 2001
+From 88eb5f06dd1c4833126fcc91565b2bfb4b5c7d27 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit e867021dadd7976758b4892cb64b19078a1855e0 ]
+
@@ -9 +10,0 @@
-Cc: stable at dpdk.org
@@ -18 +19 @@
-index 8b43e8160b..d4224992ee 100644
+index 7a95a1c437..7bac482e92 100644
@@ -21 +22 @@
-@@ -459,12 +459,9 @@ err_set:
+@@ -460,12 +460,9 @@ err_set:
More information about the stable
mailing list