From nobody Mon Feb 9 05:59:55 2026 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.15]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0C5CC22E400; Wed, 5 Mar 2025 13:01:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.15 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741179693; cv=none; b=o99Stetez5rrMAC+5VU+xix/R0lgmqm6dhDbTeUq4IhWpNqTQOCTNYvNgk9iPLNCmTAAVeAOHlVjSnwzjLW4Ld6ypuprf0TzMoY14zr+TLMxFqR9pHyNzsvgRvWidswlFjUnh44YjqgatzKuu2e30AH2I+zB0vav7s95h1vJM/4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741179693; c=relaxed/simple; bh=T8A6HBID+bnKK/poo4ku3s8z+sc9q3eeNC3dnooWZpk=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=dvWM8ilKrPKVzwQog4YUlaZDAHG8f6iUZcQfR/705BrbCa7cfjOtVAyU5CBr3MaN+uF+NcqmWVScEVCL7zY9vH5dWlOvqPM03C5fS9JHwtjL3gmuT3N4QfyJkyblHjmuzB/EEVg/dcNF+EY82iC6K605Yfa+Db4hwJgsosOmqto= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=TfzWCUPP; arc=none smtp.client-ip=198.175.65.15 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="TfzWCUPP" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1741179693; x=1772715693; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=T8A6HBID+bnKK/poo4ku3s8z+sc9q3eeNC3dnooWZpk=; b=TfzWCUPPm2qBqq2OoWT9DEjVrvmWpX62cDTPtgrcYyneP1CN2T8GD+b4 yw1Ic0PCC5e0afnJeryPP+j+jCHiT8hf/pbxeRH0pEg6AAYLLm2m6aWoS dMn3Z3aPdRhpN5UpLUm2uS0duxa53EXf2v0JwxiyGtahiRHF3/cBMl2g3 Oq1eoUreNaomiZDZeqXtrAdR9EnVaoB5mhAm0r+KECl8/DL2SCS+esHMU a5oa4qBriFqMEzIkXjUYs4Zx8fm1GG3r/W+DLaXb420pvlkKIYpnPmsDI YrV7EK4Ci7311cOlqb2ooI6NQ/nRxyc0L07qWS53aZud5XwdMLDBIkEZR Q==; X-CSE-ConnectionGUID: iPni+AaGRbum4yfR1FfOsA== X-CSE-MsgGUID: MItdoIeYTTiAawJ5402puw== X-IronPort-AV: E=McAfee;i="6700,10204,11363"; a="45794992" X-IronPort-AV: E=Sophos;i="6.14,223,1736841600"; d="scan'208";a="45794992" Received: from fmviesa005.fm.intel.com ([10.60.135.145]) by orvoesa107.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Mar 2025 05:01:31 -0800 X-CSE-ConnectionGUID: pubTXDQ+Rvyotxh2dqI6TQ== X-CSE-MsgGUID: hVICYxHCSZqdtIEeu4mnVQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.14,223,1736841600"; d="scan'208";a="123277028" Received: from mohdfai2-ilbpg12-1.png.intel.com ([10.88.227.73]) by fmviesa005.fm.intel.com with ESMTP; 05 Mar 2025 05:01:23 -0800 From: Faizal Rahim To: Tony Nguyen , Przemek Kitszel , Andrew Lunn , "David S . Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Maxime Coquelin , Alexandre Torgue , Simon Horman , Russell King , Alexei Starovoitov , Daniel Borkmann , Jesper Dangaard Brouer , John Fastabend , Furong Xu <0x1207@gmail.com>, Russell King , Vladimir Oltean , Serge Semin , Xiaolei Wang , Suraj Jaiswal , Kory Maincent , Gal Pressman , Jesper Nilsson , Choong Yong Liang , Chwee-Lin Choong , Faizal Rahim , Kunihiko Hayashi , Vinicius Costa Gomes , intel-wired-lan@lists.osuosl.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, bpf@vger.kernel.org Subject: [PATCH iwl-next v8 04/11] igc: rename xdp_get_tx_ring() for non-xdp usage Date: Wed, 5 Mar 2025 08:00:19 -0500 Message-Id: <20250305130026.642219-5-faizal.abdul.rahim@linux.intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250305130026.642219-1-faizal.abdul.rahim@linux.intel.com> References: <20250305130026.642219-1-faizal.abdul.rahim@linux.intel.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Renamed xdp_get_tx_ring() function to a more generic name for use in upcoming frame preemption patches. Signed-off-by: Faizal Rahim --- drivers/net/ethernet/intel/igc/igc.h | 2 +- drivers/net/ethernet/intel/igc/igc_main.c | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/drivers/net/ethernet/intel/igc/igc.h b/drivers/net/ethernet/in= tel/igc/igc.h index b8111ad9a9a8..22ecdac26cf4 100644 --- a/drivers/net/ethernet/intel/igc/igc.h +++ b/drivers/net/ethernet/intel/igc/igc.h @@ -736,7 +736,7 @@ struct igc_nfc_rule *igc_get_nfc_rule(struct igc_adapte= r *adapter, u32 location); int igc_add_nfc_rule(struct igc_adapter *adapter, struct igc_nfc_rule *rul= e); void igc_del_nfc_rule(struct igc_adapter *adapter, struct igc_nfc_rule *ru= le); - +struct igc_ring *igc_get_tx_ring(struct igc_adapter *adapter, int cpu); void igc_ptp_init(struct igc_adapter *adapter); void igc_ptp_reset(struct igc_adapter *adapter); void igc_ptp_suspend(struct igc_adapter *adapter); diff --git a/drivers/net/ethernet/intel/igc/igc_main.c b/drivers/net/ethern= et/intel/igc/igc_main.c index 56a35d58e7a6..db4a36afcec6 100644 --- a/drivers/net/ethernet/intel/igc/igc_main.c +++ b/drivers/net/ethernet/intel/igc/igc_main.c @@ -2444,8 +2444,7 @@ static int igc_xdp_init_tx_descriptor(struct igc_ring= *ring, return -ENOMEM; } =20 -static struct igc_ring *igc_xdp_get_tx_ring(struct igc_adapter *adapter, - int cpu) +struct igc_ring *igc_get_tx_ring(struct igc_adapter *adapter, int cpu) { int index =3D cpu; =20 @@ -2469,7 +2468,7 @@ static int igc_xdp_xmit_back(struct igc_adapter *adap= ter, struct xdp_buff *xdp) if (unlikely(!xdpf)) return -EFAULT; =20 - ring =3D igc_xdp_get_tx_ring(adapter, cpu); + ring =3D igc_get_tx_ring(adapter, cpu); nq =3D txring_txq(ring); =20 __netif_tx_lock(nq, cpu); @@ -2546,7 +2545,7 @@ static void igc_finalize_xdp(struct igc_adapter *adap= ter, int status) struct igc_ring *ring; =20 if (status & IGC_XDP_TX) { - ring =3D igc_xdp_get_tx_ring(adapter, cpu); + ring =3D igc_get_tx_ring(adapter, cpu); nq =3D txring_txq(ring); =20 __netif_tx_lock(nq, cpu); @@ -6699,7 +6698,7 @@ static int igc_xdp_xmit(struct net_device *dev, int n= um_frames, if (unlikely(flags & ~XDP_XMIT_FLAGS_MASK)) return -EINVAL; =20 - ring =3D igc_xdp_get_tx_ring(adapter, cpu); + ring =3D igc_get_tx_ring(adapter, cpu); nq =3D txring_txq(ring); =20 __netif_tx_lock(nq, cpu); --=20 2.34.1