patch 'net/cpfl: fix variable shadowing' has been queued to stable release 24.11.5

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 24.11.5

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 02/22/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/bluca/dpdk-stable

This queued commit can be viewed at:
https://github.com/bluca/dpdk-stable/commit/bfb5354f8a70aaa7df04223773bc578bc5e445c1

Thanks.

Luca Boccassi

---
>From bfb5354f8a70aaa7df04223773bc578bc5e445c1 Mon Sep 17 00:00:00 2001
From: Bruce Richardson <bruce.richardson at intel.com>
Date: Wed, 14 Jan 2026 15:44:30 +0000
Subject: [PATCH] net/cpfl: fix variable shadowing

[ upstream commit b26d1df93beba75aa22d8f7cbc0e5d4756494db6 ]

Remove unnecessary variable definitions to ensure compiling with
-Wshadow enabled.

Fixes: db042ef09d26 ("net/cpfl: implement FXP rule creation and destroying")
Fixes: 41f20298ee8c ("net/cpfl: parse flow offloading hint from JSON")
Fixes: 3ca8f6b55435 ("net/cpfl: remove devargs from adapter structure")

Signed-off-by: Bruce Richardson <bruce.richardson at intel.com>
Acked-by: Stephen Hemminger <stephen at networkplumber.org>
Acked-by: Praveen Shetty <praveen.shetty at intel.com>
---
 drivers/net/cpfl/cpfl_flow_engine_fxp.c | 2 --
 drivers/net/cpfl/cpfl_flow_parser.c     | 6 +++---
 drivers/net/cpfl/cpfl_fxp_rule.h        | 2 --
 drivers/net/cpfl/cpfl_representor.h     | 2 +-
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/drivers/net/cpfl/cpfl_flow_engine_fxp.c b/drivers/net/cpfl/cpfl_flow_engine_fxp.c
index 689ed82f18..361827cb10 100644
--- a/drivers/net/cpfl/cpfl_flow_engine_fxp.c
+++ b/drivers/net/cpfl/cpfl_flow_engine_fxp.c
@@ -386,8 +386,6 @@ cpfl_fxp_parse_action(struct cpfl_itf *itf,
 	}
 
 	if (mr_action) {
-		uint32_t i;
-
 		for (i = 0; i < rim->mr_num; i++)
 			if (cpfl_parse_mod_content(itf->adapter, rinfo,
 						   &rim->rules[rim->pr_num + i],
diff --git a/drivers/net/cpfl/cpfl_flow_parser.c b/drivers/net/cpfl/cpfl_flow_parser.c
index a67c773d18..e7deb619ee 100644
--- a/drivers/net/cpfl/cpfl_flow_parser.c
+++ b/drivers/net/cpfl/cpfl_flow_parser.c
@@ -1098,12 +1098,12 @@ cpfl_parse_fieldvectors(struct cpfl_itf *itf, struct cpfl_flow_js_fv *js_fvs, in
 			fv[2 * offset] = (uint8_t)(temp_fv >> 8);
 			fv[2 * offset + 1] = (uint8_t)(temp_fv & 0x00ff);
 		} else if (type == CPFL_FV_TYPE_METADATA) {
-			uint16_t type, v_offset, mask;
+			uint16_t v_offset, mask;
 
-			type = js_fv->meta.type;
 			v_offset = js_fv->meta.offset;
 			mask = js_fv->meta.mask;
-			temp_fv = cpfl_metadata_read16(&itf->adapter->meta, type, v_offset) & mask;
+			temp_fv = cpfl_metadata_read16(&itf->adapter->meta, js_fv->meta.type,
+					v_offset) & mask;
 			fv[2 * offset] = (uint8_t)(temp_fv & 0x00ff);
 			fv[2 * offset + 1] = (uint8_t)(temp_fv >> 8);
 		} else if (type == CPFL_FV_TYPE_PROTOCOL) {
diff --git a/drivers/net/cpfl/cpfl_fxp_rule.h b/drivers/net/cpfl/cpfl_fxp_rule.h
index ed757b80b1..94eab6808c 100644
--- a/drivers/net/cpfl/cpfl_fxp_rule.h
+++ b/drivers/net/cpfl/cpfl_fxp_rule.h
@@ -53,8 +53,6 @@ struct cpfl_rule_info {
 	};
 };
 
-extern struct cpfl_vport_ext *vport;
-
 int cpfl_rule_process(struct cpfl_itf *itf,
 		      struct idpf_ctlq_info *tx_cq,
 		      struct idpf_ctlq_info *rx_cq,
diff --git a/drivers/net/cpfl/cpfl_representor.h b/drivers/net/cpfl/cpfl_representor.h
index d7f6e186f8..5c3d3aa3f6 100644
--- a/drivers/net/cpfl/cpfl_representor.h
+++ b/drivers/net/cpfl/cpfl_representor.h
@@ -21,7 +21,7 @@ struct cpfl_repr_param {
 	struct cpfl_vport_info *vport_info;
 };
 
-extern struct cpfl_devargs *devargs;
+struct cpfl_devargs;
 
 int cpfl_repr_devargs_process(struct cpfl_adapter_ext *adapter, struct cpfl_devargs *devargs);
 int cpfl_repr_create(struct rte_pci_device *pci_dev, struct cpfl_adapter_ext *adapter);
-- 
2.47.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2026-02-20 14:55:43.938608843 +0000
+++ 0015-net-cpfl-fix-variable-shadowing.patch	2026-02-20 14:55:43.176190600 +0000
@@ -1 +1 @@
-From b26d1df93beba75aa22d8f7cbc0e5d4756494db6 Mon Sep 17 00:00:00 2001
+From bfb5354f8a70aaa7df04223773bc578bc5e445c1 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit b26d1df93beba75aa22d8f7cbc0e5d4756494db6 ]
+
@@ -12 +13,0 @@
-Cc: stable at dpdk.org
@@ -18,4 +19,4 @@
- drivers/net/intel/cpfl/cpfl_flow_engine_fxp.c | 2 --
- drivers/net/intel/cpfl/cpfl_flow_parser.c     | 6 +++---
- drivers/net/intel/cpfl/cpfl_fxp_rule.h        | 2 --
- drivers/net/intel/cpfl/cpfl_representor.h     | 2 +-
+ drivers/net/cpfl/cpfl_flow_engine_fxp.c | 2 --
+ drivers/net/cpfl/cpfl_flow_parser.c     | 6 +++---
+ drivers/net/cpfl/cpfl_fxp_rule.h        | 2 --
+ drivers/net/cpfl/cpfl_representor.h     | 2 +-
@@ -24 +25 @@
-diff --git a/drivers/net/intel/cpfl/cpfl_flow_engine_fxp.c b/drivers/net/intel/cpfl/cpfl_flow_engine_fxp.c
+diff --git a/drivers/net/cpfl/cpfl_flow_engine_fxp.c b/drivers/net/cpfl/cpfl_flow_engine_fxp.c
@@ -26,2 +27,2 @@
---- a/drivers/net/intel/cpfl/cpfl_flow_engine_fxp.c
-+++ b/drivers/net/intel/cpfl/cpfl_flow_engine_fxp.c
+--- a/drivers/net/cpfl/cpfl_flow_engine_fxp.c
++++ b/drivers/net/cpfl/cpfl_flow_engine_fxp.c
@@ -37 +38 @@
-diff --git a/drivers/net/intel/cpfl/cpfl_flow_parser.c b/drivers/net/intel/cpfl/cpfl_flow_parser.c
+diff --git a/drivers/net/cpfl/cpfl_flow_parser.c b/drivers/net/cpfl/cpfl_flow_parser.c
@@ -39,2 +40,2 @@
---- a/drivers/net/intel/cpfl/cpfl_flow_parser.c
-+++ b/drivers/net/intel/cpfl/cpfl_flow_parser.c
+--- a/drivers/net/cpfl/cpfl_flow_parser.c
++++ b/drivers/net/cpfl/cpfl_flow_parser.c
@@ -57 +58 @@
-diff --git a/drivers/net/intel/cpfl/cpfl_fxp_rule.h b/drivers/net/intel/cpfl/cpfl_fxp_rule.h
+diff --git a/drivers/net/cpfl/cpfl_fxp_rule.h b/drivers/net/cpfl/cpfl_fxp_rule.h
@@ -59,2 +60,2 @@
---- a/drivers/net/intel/cpfl/cpfl_fxp_rule.h
-+++ b/drivers/net/intel/cpfl/cpfl_fxp_rule.h
+--- a/drivers/net/cpfl/cpfl_fxp_rule.h
++++ b/drivers/net/cpfl/cpfl_fxp_rule.h
@@ -70 +71 @@
-diff --git a/drivers/net/intel/cpfl/cpfl_representor.h b/drivers/net/intel/cpfl/cpfl_representor.h
+diff --git a/drivers/net/cpfl/cpfl_representor.h b/drivers/net/cpfl/cpfl_representor.h
@@ -72,2 +73,2 @@
---- a/drivers/net/intel/cpfl/cpfl_representor.h
-+++ b/drivers/net/intel/cpfl/cpfl_representor.h
+--- a/drivers/net/cpfl/cpfl_representor.h
++++ b/drivers/net/cpfl/cpfl_representor.h