patch 'net/mvpp2: fix variable shadowing' has been queued to stable release 23.11.7

[Shani Peretz]

Hi,

FYI, your patch has been queued to stable release 23.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 04/05/26. 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/shanipr/dpdk-stable

This queued commit can be viewed at:
https://github.com/shanipr/dpdk-stable/commit/24f163b0ae85a490c49bfdf3b4422a1b93526a70

Thanks.

Shani

---
>From 24f163b0ae85a490c49bfdf3b4422a1b93526a70 Mon Sep 17 00:00:00 2001
From: Thomas Monjalon <thomas at monjalon.net>
Date: Wed, 21 Jan 2026 12:06:01 +0100
Subject: [PATCH] net/mvpp2: fix variable shadowing

[ upstream commit fc97ac545fcb5983dd9f6b5c9cc4a957968e8c8f ]

With shadowing warning enabled, we can see "i" was declared twice:

drivers/net/mvpp2/mrvl_ethdev.c: In function 'mrvl_rx_pkt_burst':
error: declaration of 'i' shadows a previous local [-Werror=shadow]
 2676 |                         int i;
      |                             ^
/mrvl_ethdev.c:2592:13: note: shadowed declaration is here
 2592 |         int i, ret, rx_done = 0;
      |             ^

Fixes: afb4d0d0bf91 ("net/mrvl: add Rx/Tx support")

Signed-off-by: Thomas Monjalon <thomas at monjalon.net>
Acked-by: David Marchand <david.marchand at redhat.com>
Acked-by: Bruce Richardson <bruce.richardson at intel.com>
---
 drivers/net/mvpp2/mrvl_ethdev.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/net/mvpp2/mrvl_ethdev.c b/drivers/net/mvpp2/mrvl_ethdev.c
index 4cc64c7cad..9b23ca63cb 100644
--- a/drivers/net/mvpp2/mrvl_ethdev.c
+++ b/drivers/net/mvpp2/mrvl_ethdev.c
@@ -2667,7 +2667,6 @@ mrvl_rx_pkt_burst(void *rxq, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)
 			     (!rx_done && num < q->priv->bpool_init_size))) {
 			mrvl_fill_bpool(q, q->priv->fill_bpool_buffs);
 		} else if (unlikely(num > q->priv->bpool_max_size)) {
-			int i;
 			int pkt_to_remove = num - q->priv->bpool_init_size;
 			struct rte_mbuf *mbuf;
 			struct pp2_buff_inf buff;
-- 
2.43.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2026-03-31 00:32:32.402470936 +0300
+++ 0033-net-mvpp2-fix-variable-shadowing.patch	2026-03-31 00:32:28.875237000 +0300
@@ -1 +1 @@
-From fc97ac545fcb5983dd9f6b5c9cc4a957968e8c8f Mon Sep 17 00:00:00 2001
+From 24f163b0ae85a490c49bfdf3b4422a1b93526a70 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit fc97ac545fcb5983dd9f6b5c9cc4a957968e8c8f ]
+
@@ -17 +18,0 @@
-Cc: stable at dpdk.org
@@ -27 +28 @@
-index 845819e4d8..1074092d43 100644
+index 4cc64c7cad..9b23ca63cb 100644
@@ -30 +31 @@
-@@ -2673,7 +2673,6 @@ mrvl_rx_pkt_burst(void *rxq, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)
+@@ -2667,7 +2667,6 @@ mrvl_rx_pkt_burst(void *rxq, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)