From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 5B61B48BF9; Mon, 1 Dec 2025 12:47:01 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id CB17D40A76; Mon, 1 Dec 2025 12:45:24 +0100 (CET) Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.12]) by mails.dpdk.org (Postfix) with ESMTP id 76628406BC; Mon, 1 Dec 2025 12:45:20 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1764589521; x=1796125521; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=QYEAgmwhrvSGrMTJRAYxf1goHHKc7mL909dj009R/q0=; b=XNhfwRDqSdtqy+3mxQIMLJlSohWQrtA3XN4Aue+bK3nf6HcknKpWnHry YnBd1pan1YXmVofMZAcHR3u3zPAo5FeM4Hfkub6cjnqDRGl8iJ4IUCMab vCunnY3datvh5jaEo195LUoRpmtt2+HzI1P1M+AaWGl8Rvx7/BfCKXdDX 2caDH8urWF3au1HfBfQsmequE1qoDFNRZ+NR6dOQv+cpcGuFI2viHdDve lfwvD3Yug1A6p5Pr2sBM9/61gsNiikky8QUgFJiEWsu1wWLScSFnRyQmL Kd79MgqG6A5nw8RaWQ62Qx1ZpHPlWQ3vfGjNHNMRf+NkniUVi+NMSOIPi w==; X-CSE-ConnectionGUID: cTzGIA54Q9aGrbQqgGsN1g== X-CSE-MsgGUID: cNuLyWWJTnitfuH/N+Yfog== X-IronPort-AV: E=McAfee;i="6800,10657,11629"; a="77991741" X-IronPort-AV: E=Sophos;i="6.20,240,1758610800"; d="scan'208";a="77991741" Received: from fmviesa003.fm.intel.com ([10.60.135.143]) by orvoesa104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Dec 2025 03:45:20 -0800 X-CSE-ConnectionGUID: y8UW3OT0Rw6Oe/TMqNbIzw== X-CSE-MsgGUID: cCH98/RMTbOroP9pzthffQ== X-ExtLoop1: 1 Received: from silpixa00401385.ir.intel.com ([10.20.224.226]) by fmviesa003.fm.intel.com with ESMTP; 01 Dec 2025 03:45:19 -0800 From: Bruce Richardson To: dev@dpdk.org Cc: Bruce Richardson , stable@dpdk.org, Stephen Hemminger Subject: [PATCH v3 16/31] net/cpfl: fix build with shadow warnings enabled Date: Mon, 1 Dec 2025 11:44:33 +0000 Message-ID: <20251201114448.1441377-17-bruce.richardson@intel.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251201114448.1441377-1-bruce.richardson@intel.com> References: <20251106140948.2894678-1-bruce.richardson@intel.com> <20251201114448.1441377-1-bruce.richardson@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org 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") Cc: stable@dpdk.org Signed-off-by: Bruce Richardson Acked-by: Stephen Hemminger --- 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 +- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/drivers/net/intel/cpfl/cpfl_flow_engine_fxp.c b/drivers/net/intel/cpfl/cpfl_flow_engine_fxp.c index 689ed82f18..361827cb10 100644 --- a/drivers/net/intel/cpfl/cpfl_flow_engine_fxp.c +++ b/drivers/net/intel/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/intel/cpfl/cpfl_flow_parser.c b/drivers/net/intel/cpfl/cpfl_flow_parser.c index a67c773d18..e7deb619ee 100644 --- a/drivers/net/intel/cpfl/cpfl_flow_parser.c +++ b/drivers/net/intel/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/intel/cpfl/cpfl_fxp_rule.h b/drivers/net/intel/cpfl/cpfl_fxp_rule.h index ed757b80b1..94eab6808c 100644 --- a/drivers/net/intel/cpfl/cpfl_fxp_rule.h +++ b/drivers/net/intel/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/intel/cpfl/cpfl_representor.h b/drivers/net/intel/cpfl/cpfl_representor.h index d7f6e186f8..5c3d3aa3f6 100644 --- a/drivers/net/intel/cpfl/cpfl_representor.h +++ b/drivers/net/intel/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.51.0