From patchwork Mon Mar 3 10:26:51 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Faizal Rahim X-Patchwork-Id: 13998520 X-Patchwork-Delegate: kuba@kernel.org Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.9]) (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 1FBC61F37B8; Mon, 3 Mar 2025 10:27:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.9 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740997667; cv=none; b=oa75ebtTJc+n8UV14ltC7MKfikGRdZjdSsvcLDV17hapbQjicSx4dytaUmXq7xsi+RaQd19elX3xwuMu39y2JA+GAB3wj2rNxEBQTFbJJrpux0TdYiyXu8IpxK4p3kJ52uvMv6a7bfcx++LOZ/KnpapSsOsUCLIiTo4sUewCXKU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740997667; c=relaxed/simple; bh=T8A6HBID+bnKK/poo4ku3s8z+sc9q3eeNC3dnooWZpk=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=jdsfjpnt5dbDS6gVzr69eDmKYqLX77Q6r4bMg+hRnmW0ypmdw3Cn6+mfztWpPi+kqjzeuVEIqvV52Emy+gIAXDCzOjYtMc3in00+19FGkoskLLfgZ/3m9K8Vngg7MbgYA9Hg6DWGoXNeHc6yb7J/C1f+GtZRrM2j5dvGl6pyqZA= 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=iReqcxLu; arc=none smtp.client-ip=198.175.65.9 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="iReqcxLu" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1740997666; x=1772533666; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=T8A6HBID+bnKK/poo4ku3s8z+sc9q3eeNC3dnooWZpk=; b=iReqcxLuRU80gMw8lw28m5GEr1qSIFjqzU5Baln3QoXRoz4jor8Gvihr e5Br2XoFc6u2qfho9t3d2j68IKaqoZlJb4w13muoxQ4EVuK9A48t3EXYf lGia0KwkqR9oyyNKwWYUqriq2ALYO+7MWlpNLdGzjZatcib3WalE4NTDo J1c5MN/oeBmxAw4ReVjk46s8KESjJM3EKq1P1eZoOP7T903zdi1PcaX2A wLIVyLLrcAWr7CE+UTIcbl25N9xrAgcGLnhJVZ57gmBCDbUXZYY9AiITw aQZWIQAXYv+ep5wxLDEfJIyGLOlW7oVQLoqLEdADSF7nVUi7Zmo2cxB6g Q==; X-CSE-ConnectionGUID: B6F8jgGCSGCPWE5+kliRcA== X-CSE-MsgGUID: NjkMqJkSTPStGPnhRxGchg== X-IronPort-AV: E=McAfee;i="6700,10204,11361"; a="64310091" X-IronPort-AV: E=Sophos;i="6.13,329,1732608000"; d="scan'208";a="64310091" Received: from fmviesa005.fm.intel.com ([10.60.135.145]) by orvoesa101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Mar 2025 02:27:46 -0800 X-CSE-ConnectionGUID: 7fVOKAx7RNGtC9ocqJZKPQ== X-CSE-MsgGUID: +q4WOX2zRPufK0R4n6qxcA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.13,329,1732608000"; d="scan'208";a="122569867" Received: from mohdfai2-ilbpg12-1.png.intel.com ([10.88.227.73]) by fmviesa005.fm.intel.com with ESMTP; 03 Mar 2025 02:27:38 -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 v7 2/9] igc: Rename xdp_get_tx_ring() for non-xdp usage Date: Mon, 3 Mar 2025 05:26:51 -0500 Message-Id: <20250303102658.3580232-3-faizal.abdul.rahim@linux.intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250303102658.3580232-1-faizal.abdul.rahim@linux.intel.com> References: <20250303102658.3580232-1-faizal.abdul.rahim@linux.intel.com> Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org 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/intel/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_adapter *adapter, u32 location); int igc_add_nfc_rule(struct igc_adapter *adapter, struct igc_nfc_rule *rule); void igc_del_nfc_rule(struct igc_adapter *adapter, struct igc_nfc_rule *rule); - +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/ethernet/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; } -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 = cpu; @@ -2469,7 +2468,7 @@ static int igc_xdp_xmit_back(struct igc_adapter *adapter, struct xdp_buff *xdp) if (unlikely(!xdpf)) return -EFAULT; - ring = igc_xdp_get_tx_ring(adapter, cpu); + ring = igc_get_tx_ring(adapter, cpu); nq = txring_txq(ring); __netif_tx_lock(nq, cpu); @@ -2546,7 +2545,7 @@ static void igc_finalize_xdp(struct igc_adapter *adapter, int status) struct igc_ring *ring; if (status & IGC_XDP_TX) { - ring = igc_xdp_get_tx_ring(adapter, cpu); + ring = igc_get_tx_ring(adapter, cpu); nq = txring_txq(ring); __netif_tx_lock(nq, cpu); @@ -6699,7 +6698,7 @@ static int igc_xdp_xmit(struct net_device *dev, int num_frames, if (unlikely(flags & ~XDP_XMIT_FLAGS_MASK)) return -EINVAL; - ring = igc_xdp_get_tx_ring(adapter, cpu); + ring = igc_get_tx_ring(adapter, cpu); nq = txring_txq(ring); __netif_tx_lock(nq, cpu);