From nobody Sun Feb 8 23:04:09 2026 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.18]) (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 A6291233155; Thu, 27 Feb 2025 14:02:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740664964; cv=none; b=WxvMpKT4wIDHSdKNHffB0tnkpaHI+0ZLz+/xeUkye5DAvm6tZzrkIc+cLDWaVzElIvO7B7k3ACoWs0ywhJYE0SO4QGLf+CRzHDr4luESzxNKR/6eQv8/RDzx3DB+rC6Hr7F5PsN8RrH3g8jwgvD9v1f21/5uQ+ZMnB+nd8mCf2Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740664964; c=relaxed/simple; bh=y/vg46vRn1lgg6h2OUWs7r6Zp75W28a+qluOoO9J7Nk=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Tl3jJpuLIw6bs4fQi9ZYIKE22dUmqza0xDhuzR8mT1ZQgbg6ZkS2+kY9YLTJGZfdGU5tpLV+4m5SPPzUO9Bt4ajLw6M8zOrOIOh1MIxOUlfVFG+POvgWdleCRvs8UYiNMr70EKPE/3NwP0aDNPmB14yK0zKOu7TSZ9reab18BWo= 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=Vx13hn50; arc=none smtp.client-ip=198.175.65.18 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="Vx13hn50" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1740664963; x=1772200963; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=y/vg46vRn1lgg6h2OUWs7r6Zp75W28a+qluOoO9J7Nk=; b=Vx13hn50fCIUToIhcP0c5NfBMha+j55QnKFjNhASrYNhgS9JnnLLz+pT Z1BPYHOqSCW8OY/zgPEK08t+mp3JRRm4p1DJ6f1gyWOph0MnbYWboxLEF t1dEDNnp1AtHgSAIooo9INHyU5DvM4D9jLTuF1i3gvlezix3lspa7WINu Gz+HQb1hf2lHZdHHr5OQBvIVS66DEn8h9gcbrwUKBRNavBRniuz+gVOaY Gnh32ZTD2EvYO+Jo7PDawbbulYEgMhaxgCd3NKAhM22Lc5Viz9SN5yJQk 4lz86Rv2x1fK8s9+noTY+qyUlPG8kdc/ruj9sP6i2Oc+pTj3TpqRYefa+ Q==; X-CSE-ConnectionGUID: werPZxneQtGfvJggyZuRuQ== X-CSE-MsgGUID: i7FpeNYgQ4qShUKpg9u6Tw== X-IronPort-AV: E=McAfee;i="6700,10204,11314"; a="41752313" X-IronPort-AV: E=Sophos;i="6.12,310,1728975600"; d="scan'208";a="41752313" Received: from fmviesa004.fm.intel.com ([10.60.135.144]) by orvoesa110.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Feb 2025 06:02:42 -0800 X-CSE-ConnectionGUID: NhBMIehdRk6BeJsHKOXElA== X-CSE-MsgGUID: QueMaA3QToyFdCn831cvsQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.13,319,1732608000"; d="scan'208";a="122149471" Received: from mohdfai2-ilbpg12-1.png.intel.com ([10.88.227.73]) by fmviesa004.fm.intel.com with ESMTP; 27 Feb 2025 06:02:34 -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 , Andrew Halaney , Choong Yong Liang , 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 v6 2/9] igc: Rename xdp_get_tx_ring() for non-xdp usage Date: Thu, 27 Feb 2025 09:01:50 -0500 Message-Id: <20250227140158.2129988-3-faizal.abdul.rahim@linux.intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250227140158.2129988-1-faizal.abdul.rahim@linux.intel.com> References: <20250227140158.2129988-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 | 10 +++++----- 2 files changed, 6 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..44e4f925491f 100644 --- a/drivers/net/ethernet/intel/igc/igc_main.c +++ b/drivers/net/ethernet/intel/igc/igc_main.c @@ -2444,8 +2444,8 @@ 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 +2469,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 +2546,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 +6699,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