[PATCH 0/2] More fixes after enabling -Wshadow

[PATCH 0/2] More fixes after enabling -Wshadow

[Thomas Monjalon]

The drivers mvpp2 and mlx5 for Windows
were not checked when enabling -Wshadow.
Here are the missing small fixes.

Thomas Monjalon (2):
  common/mlx5: fix variable shadowing
  net/mvpp2: fix variable shadowing

 drivers/common/mlx5/windows/mlx5_glue.h | 2 +-
 drivers/net/mvpp2/mrvl_ethdev.c         | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

-- 
2.52.0

[PATCH 1/2] common/mlx5: fix variable shadowing

[Thomas Monjalon]

The word "unused" is too common for being used in a header.
There is a warning because a parameter is named "unused" in mbuf:

lib/mbuf/rte_mbuf.h: In function 'rte_mbuf_tx_offload':
error: declaration of 'unused' shadows a previous local [-Werror=shadow]
 1910 |         uint64_t ol3, uint64_t ol2, uint64_t unused)
      |                                     ~~~~~~~~~^~~~~~

Such value should be prefixed with "MLX5".

Fixes: bd935fe3e624 ("net/mlx5: wrap sampling actions per OS")
Cc: stable@dpdk.org

Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
---
 drivers/common/mlx5/windows/mlx5_glue.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/common/mlx5/windows/mlx5_glue.h b/drivers/common/mlx5/windows/mlx5_glue.h
index 5ba324ebc4..f53142e3d4 100644
--- a/drivers/common/mlx5/windows/mlx5_glue.h
+++ b/drivers/common/mlx5/windows/mlx5_glue.h
@@ -16,7 +16,7 @@
 #endif
 
 #ifndef HAVE_MLX5DV_DR
-enum  mlx5dv_dr_domain_type { unused, };
+enum  mlx5dv_dr_domain_type { MLX5_UNUSED_DOMAIN_TYPE };
 struct mlx5dv_dr_domain;
 struct mlx5dv_dr_action;
 #endif
-- 
2.52.0

[PATCH 2/2] net/mvpp2: fix variable shadowing

[Thomas Monjalon]

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")
Cc: stable@dpdk.org

Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
---
 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 845819e4d8..1074092d43 100644
--- a/drivers/net/mvpp2/mrvl_ethdev.c
+++ b/drivers/net/mvpp2/mrvl_ethdev.c
@@ -2673,7 +2673,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.52.0

Re: [PATCH 1/2] common/mlx5: fix variable shadowing

[David Marchand]

On Wed, 21 Jan 2026 at 12:08, Thomas Monjalon <thomas@monjalon.net> wrote:
>
> The word "unused" is too common for being used in a header.
> There is a warning because a parameter is named "unused" in mbuf:
>
> lib/mbuf/rte_mbuf.h: In function 'rte_mbuf_tx_offload':
> error: declaration of 'unused' shadows a previous local [-Werror=shadow]
>  1910 |         uint64_t ol3, uint64_t ol2, uint64_t unused)
>       |                                     ~~~~~~~~~^~~~~~
>
> Such value should be prefixed with "MLX5".
>
> Fixes: bd935fe3e624 ("net/mlx5: wrap sampling actions per OS")
> Cc: stable@dpdk.org
>
> Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
Acked-by: David Marchand <david.marchand@redhat.com>


-- 
David Marchand

Re: [PATCH 2/2] net/mvpp2: fix variable shadowing

[David Marchand]

On Wed, 21 Jan 2026 at 12:08, Thomas Monjalon <thomas@monjalon.net> wrote:
>
> 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")
> Cc: stable@dpdk.org
>
> Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
Acked-by: David Marchand <david.marchand@redhat.com>


-- 
David Marchand

Re: [PATCH 0/2] More fixes after enabling -Wshadow

[Bruce Richardson]

On Wed, Jan 21, 2026 at 12:05:59PM +0100, Thomas Monjalon wrote:
> The drivers mvpp2 and mlx5 for Windows
> were not checked when enabling -Wshadow.
> Here are the missing small fixes.
> 
> Thomas Monjalon (2):
>   common/mlx5: fix variable shadowing
>   net/mvpp2: fix variable shadowing
> 
>  drivers/common/mlx5/windows/mlx5_glue.h | 2 +-
>  drivers/net/mvpp2/mrvl_ethdev.c         | 1 -
>  2 files changed, 1 insertion(+), 2 deletions(-)
> 
Thanks Thomas.

Acked-by: Bruce Richardson <bruce.richardson@intel.com>

Re: [PATCH 0/2] More fixes after enabling -Wshadow

[David Marchand]

On Wed, 21 Jan 2026 at 12:08, Thomas Monjalon <thomas@monjalon.net> wrote:
>
> The drivers mvpp2 and mlx5 for Windows
> were not checked when enabling -Wshadow.
> Here are the missing small fixes.
>
> Thomas Monjalon (2):
>   common/mlx5: fix variable shadowing
>   net/mvpp2: fix variable shadowing
>
>  drivers/common/mlx5/windows/mlx5_glue.h | 2 +-
>  drivers/net/mvpp2/mrvl_ethdev.c         | 1 -
>  2 files changed, 1 insertion(+), 2 deletions(-)

Series applied, merci Thomas.


-- 
David Marchand