From nobody Mon Feb 9 02:15:41 2026 Received: from mail-ot1-f41.google.com (mail-ot1-f41.google.com [209.85.210.41]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 20591359F9E for ; Thu, 13 Nov 2025 16:46:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763052376; cv=none; b=mU9vA2kIB/7ajyq5Gg6ylYeCeVfGX2pUrZZRQIpFjRIpSoGXaipxWSdNy6mIESsca/YpYskHFiGb2uZj4IFV3YGUGtlY8dmNQaTLf58Cd4aMegvSkqT/NbtJSh5RtKf6hYiikOf36oMYA618cQokq6ebngts6bhN5QzOg0YGiXM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763052376; c=relaxed/simple; bh=RJ6nsg4wuWJH6h/QyKbbPd0OvBVyOjvlKFeZqEdONLY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=OeLvFbvcGgPvbJgDLF+NbPx7QQv/ePH4IzgW5gB/VWU0/Myzo/RQdjAX7Pdl/nDXQJY16QL9GCE3xbthGd+ivDjxhHn5jDm0ppxMmzE5Tm+6Y1npGjVdP1rFU4k1/BxrKn4zTX3lV5W8GegpF1nKugkmAakoucYfYVSrNBOkcZ0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org; spf=pass smtp.mailfrom=gmail.com; arc=none smtp.client-ip=209.85.210.41 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-ot1-f41.google.com with SMTP id 46e09a7af769-7c6d2ec149eso698265a34.1 for ; Thu, 13 Nov 2025 08:46:14 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763052374; x=1763657174; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=OBN2WZm/+dOU7IJxKWOSEg+NlxGX9+nctR5VlBcbo74=; b=fYBc65IBnTr67soWP2sakwYZl01esW8yCwhPFveAHIqbQ8WTW53t6EGlNaynnwNlK0 A/hYhnkOQQubDDAMumq8H/QjmdsDWw3i+7D1Jm0GMmJGHo29npF6PbYFGWrXDH3G4X6R RR1ZWmuyIbwJZp7NVvDe3vM9BLaNo5aA5g1NwmSnXldqYcasUZHa+zz1wqX3BAmXH5cp vNq8Cmdapd+9uLLY6n8PaU+sTcYV02WbTP7TFkhokPICXEMoYpZgxkDm2QNh1IJazejR z77j/njV3N7MmEs+aSwn7780TPVjVhKZCgyY7DZD/OgCjxX6wmC4B3IBg/ez3a1SUvzs jsjA== X-Forwarded-Encrypted: i=1; AJvYcCXNSEgc+fHBWzuvPSPWA3+VHNRxgo8x1Qwv4Xry2p+JpZy0Hy6OLtu6y9hbOFmLtExd+lmo3hsVd8OMtGc=@vger.kernel.org X-Gm-Message-State: AOJu0YxFyBub8YIAUADeMbq7qa5m+vl/SNov69ePIWHOpbv1qhQloxoH vdT5Sx0Yk67EfxBTvXo+Q3F8W+odYsMvCdt60qf86pP5g0DavWk0OZZZ X-Gm-Gg: ASbGncvVUwavsI5SdbUEa1eNtO0p5mtJYI0CEzREpBCdSXkbJhmBLUiwXK0fEOi7FY1 qCwBqXivE2KUEPwS+QkvXhHt0StCqVQ6fKuF4m/ba/jZ0sMTOK7EfjAXXMvQZxDC2QyG1Takuqe 0QZfWdkQmWfzHWYZmNNXyDYJrDFoF2v6Yh2CUWQ8NhH14xqttFaQ2D0l2oM7TVZiPrm+Gmpgi3c Yk15NSqkP4eJe/BzyTqe9tHudGt/ZfJUYuYZkzOuB5LUGbGsT5A1cqCqsHu3C18faDEOEFxWqHV QAowjthqMkg/uk06BAtGszb9g6rrMVLdRsJEyaJHU58uQlCTCb430ryR5Dsg1bJCbxrvUw2AWEA sJN9dQn/cbLkBzGDm+ijDpNz91b2oRe2IHDyitH87282CJ11GQ+8RbjnjyV3GUM+QfmzYVDkd6k qwQvs= X-Google-Smtp-Source: AGHT+IEPG52Tne7U0YrRACo1Z+TeE3WGnQbb/AUFnv2POhqkyIWHi24LZi3+2U8QJIzPuCpVZmi3Iw== X-Received: by 2002:a9d:6163:0:b0:7c7:e3b:4860 with SMTP id 46e09a7af769-7c743dbe729mr151477a34.10.1763052374092; Thu, 13 Nov 2025 08:46:14 -0800 (PST) Received: from localhost ([2a03:2880:10ff:53::]) by smtp.gmail.com with ESMTPSA id 46e09a7af769-7c73a283b3asm1512345a34.4.2025.11.13.08.46.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Nov 2025 08:46:13 -0800 (PST) From: Breno Leitao Date: Thu, 13 Nov 2025 08:46:03 -0800 Subject: [PATCH 1/2] mlx4: extract GRXRINGS from .get_rxnfc Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251113-mlx_grxrings-v1-1-0017f2af7dd0@debian.org> References: <20251113-mlx_grxrings-v1-0-0017f2af7dd0@debian.org> In-Reply-To: <20251113-mlx_grxrings-v1-0-0017f2af7dd0@debian.org> To: Tariq Toukan , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Saeed Mahameed , Mark Bloch , Leon Romanovsky Cc: netdev@vger.kernel.org, linux-rdma@vger.kernel.org, linux-kernel@vger.kernel.org, Breno Leitao , kernel-team@meta.com X-Mailer: b4 0.15-dev-a6db3 X-Developer-Signature: v=1; a=openpgp-sha256; l=1920; i=leitao@debian.org; h=from:subject:message-id; bh=RJ6nsg4wuWJH6h/QyKbbPd0OvBVyOjvlKFeZqEdONLY=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBpFgtU20ui1SM7ldzsOfYh0RKNbAMgtZmV2SUFc AuLbQXyFFqJAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCaRYLVAAKCRA1o5Of/Hh3 bdjtEAClpuKcPUAu9a1yuZm7LxJseq0LrfszVEFz8iGSZM0uPe/VHHXL3T9x/Wg6n3VG7FgfDM/ RL3oxzVzdv+n2zTIrfY25r9T2axgewm0F8qDO1stjDHRpG5+xlmDg7Z+AD7S4VftN9AFGIec5PD lS7yXl9ozqtU+o83TOFPpGnybbz9Y/5dw8Joc1Un40poXxyx1EDNLMkr7Ip8cQJYehbJXOf2HA+ nGCo5xAhU3ruHZGibwzrGOrj97+kIRdN5n5wwoElVffIWonsAEZiICbNhbKvPUVYlRvIrVuReUY BWBB8+5txOqJbVkbalRahMGz8IIvjFwTuTi9Uwh5IpN+8RoJRo7VA9F24jvGYNF0jJyNUg24lU6 kjyW+SP05peWwELwiywdWRpSdNR4oV600iqZdiDJp3ap2jovORUw7+hnO2spkMUnRr46Qk72Zfh PVzcS5Vw4Qw9z4mkm7hdHo2TqpX5BaGbSxmkgEdyl5qseRHMfFeVkzCpH+W3WwqgIc3BLnWG187 nDItNBYB/guoxTmU9uocKOi4q91hhyJtSU57FxXjwWUMKe3BZ9eF4MilsWhp7JZg7ieYIXu4wT9 zuxFNSNGyNboZFsNl9badt/3I5nNakhMaTENvDSoX2Wzhp8evyH8WGBYX6zF61wr6bjhYBGAsLy MV2bfl3+4A1bb+Q== X-Developer-Key: i=leitao@debian.org; a=openpgp; fpr=AC8539A6E8F46702CA4A439B35A3939FFC78776D Commit 84eaf4359c36 ("net: ethtool: add get_rx_ring_count callback to optimize RX ring queries") added specific support for GRXRINGS callback, simplifying .get_rxnfc. Remove the handling of GRXRINGS in .get_rxnfc() by moving it to the new .get_rx_ring_count(). This simplifies the RX ring count retrieval and aligns mlx4 with the new ethtool API for querying RX ring parameters. This is compiled tested only. Signed-off-by: Breno Leitao Reviewed-by: Tariq Toukan --- drivers/net/ethernet/mellanox/mlx4/en_ethtool.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c b/drivers/net/= ethernet/mellanox/mlx4/en_ethtool.c index a68cd3f0304c..ad6298456639 100644 --- a/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c +++ b/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c @@ -1727,6 +1727,13 @@ static int mlx4_en_get_num_flows(struct mlx4_en_priv= *priv) =20 } =20 +static u32 mlx4_en_get_rx_ring_count(struct net_device *dev) +{ + struct mlx4_en_priv *priv =3D netdev_priv(dev); + + return priv->rx_ring_num; +} + static int mlx4_en_get_rxnfc(struct net_device *dev, struct ethtool_rxnfc = *cmd, u32 *rule_locs) { @@ -1743,9 +1750,6 @@ static int mlx4_en_get_rxnfc(struct net_device *dev, = struct ethtool_rxnfc *cmd, return -EINVAL; =20 switch (cmd->cmd) { - case ETHTOOL_GRXRINGS: - cmd->data =3D priv->rx_ring_num; - break; case ETHTOOL_GRXCLSRLCNT: cmd->rule_cnt =3D mlx4_en_get_num_flows(priv); break; @@ -2154,6 +2158,7 @@ const struct ethtool_ops mlx4_en_ethtool_ops =3D { .set_ringparam =3D mlx4_en_set_ringparam, .get_rxnfc =3D mlx4_en_get_rxnfc, .set_rxnfc =3D mlx4_en_set_rxnfc, + .get_rx_ring_count =3D mlx4_en_get_rx_ring_count, .get_rxfh_indir_size =3D mlx4_en_get_rxfh_indir_size, .get_rxfh_key_size =3D mlx4_en_get_rxfh_key_size, .get_rxfh =3D mlx4_en_get_rxfh, --=20 2.47.3 From nobody Mon Feb 9 02:15:41 2026 Received: from mail-ot1-f43.google.com (mail-ot1-f43.google.com [209.85.210.43]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 40F5F359FAB for ; Thu, 13 Nov 2025 16:46:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.43 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763052378; cv=none; b=lSWTyI2LtQ1pve65fEEcRAy5uzkjwIHlQ/IHdyunI4NhI2i9Yff+FPTFuwnD2+CI3AwQg7dV6nx466kjGxib2ZOe8tFTuhkoQldDFoLOvFyKtvlrVhi7+m7Iu3ra0+cgXYrUWJ2uV9R7OvZ6mPyUUB5g3uGqrdhfGIJNECzXItc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763052378; c=relaxed/simple; bh=poQ2ltGXAGj/R6azLC8+vFrV6fsBn4x8KuYNyoxOTxE=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=GkjMSaZT/gflhi0MY5P7QTx6YDJ1e+6zB74k4MdJkI0MRzPoS6LSNevVhuCqY5CMgCgLaXz6NhUyR6pC96tL7+GzHvCWccPd7l2WWpXOhT35JdoB9BMEB/anDfhhDQ0LPTc9KVLS2Ln981WgiuArstEW2QFMzPLmAvK+92zdiVg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org; spf=pass smtp.mailfrom=gmail.com; arc=none smtp.client-ip=209.85.210.43 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-ot1-f43.google.com with SMTP id 46e09a7af769-7c28ff7a42eso395460a34.3 for ; Thu, 13 Nov 2025 08:46:15 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763052375; x=1763657175; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=AMwHal9dzTj8WL52AK+cJ5GudloGhSjkVv/ITspvX8U=; b=hOe+8xCtAwGH1pJRwgT9CeM/Tb5Pq4kaxtuFUN67sBVcZnfhRnhyrfoSNcRKoo5NHK hnVAAojKtbZWqNUwzCx12lPapCsabaQRxoTXuLDgthCzk28AvOkk1robx7rAwUx4E+M5 OLg+yYhf8KlZceN/ZwpqvDI8UATrVMk8O33xKr+j42CvgL5oeoibPFEMKSnvJO7mHlIZ qkyS4wE4JsJyy6zaMrNlcvR6RnW3iY8bTNIl32Yla9FQtjnHwdbnOFor1m7RydFq8hQi PadPiCA8Uv1pXWjg+sGrMXK4CLuGgEMsv86Xizc1hATtUVB5rEXtFY9payvGDHEqXYJM r4aQ== X-Forwarded-Encrypted: i=1; AJvYcCVZBjxEf2ne07pL5IzHnW8QHtUkaNdFEHdnQE2oOV+JlIzxU3i4lC6lehoBmAO+5M4fz80T/Ye9bppjyhk=@vger.kernel.org X-Gm-Message-State: AOJu0Yz6nryQQhMWw/S1t0lRjprY8OYklTgIFVY8REJIuuBS2xC30pXb q4IhdL4SVtoPANjCpB/ZDlpvD5RC9lMS89sjfhyTQtjKtYKyxnYwj3Za X-Gm-Gg: ASbGncuo0d8kJT8SHQEiffmgz7Zcwb7d6MHgcQsYq6y++fLcB8PCpdX1sCSKqisgN9p xZnQKiSP1Z1RVSOSv9uctl8CRhWz5qd8bFTX6LnNanaghrhDZ8JNLxZiNe3o7kly+sqmQTsOpdJ sF5w4mpy1FWLxbhceFkMFnBohd7poxoUY8qzM53v7voxJuV/yehQ2IIIrahVTWX49ychTjRin2L F43eiOwSehlhi2MUiak4wv26oWsIM5FHxRju3Mck3VTVuhdulze+RJf9pZxmkeEmV6y8lu3lla9 SC/arlJeXVwBId9fShAJhvMfPa9J6tm4vbI9U0PNAddUXFvMq3mGRpdakDcQGE+X1fupQ0XB3PG GLk/l4POdYNe10vCq2IZqlzdXsLzbbTnrT4qLJkwaL7ujU4yn6xgq35sJfZpInlQXqSYRebPnWK jdTkWKuPUX344c X-Google-Smtp-Source: AGHT+IHwklT+fSAdTS6FhgXRWj9vGB2ajsTuhU7iPf3ZuTDe1HF6NP47ittL43ZGlAOFk7Zre3gEqA== X-Received: by 2002:a05:6830:4129:b0:7c7:162:e0c7 with SMTP id 46e09a7af769-7c7442db71dmr128771a34.6.1763052375233; Thu, 13 Nov 2025 08:46:15 -0800 (PST) Received: from localhost ([2a03:2880:10ff:5::]) by smtp.gmail.com with ESMTPSA id 46e09a7af769-7c73a283a44sm1515045a34.2.2025.11.13.08.46.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Nov 2025 08:46:14 -0800 (PST) From: Breno Leitao Date: Thu, 13 Nov 2025 08:46:04 -0800 Subject: [PATCH 2/2] mlx5: extract GRXRINGS from .get_rxnfc Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251113-mlx_grxrings-v1-2-0017f2af7dd0@debian.org> References: <20251113-mlx_grxrings-v1-0-0017f2af7dd0@debian.org> In-Reply-To: <20251113-mlx_grxrings-v1-0-0017f2af7dd0@debian.org> To: Tariq Toukan , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Saeed Mahameed , Mark Bloch , Leon Romanovsky Cc: netdev@vger.kernel.org, linux-rdma@vger.kernel.org, linux-kernel@vger.kernel.org, Breno Leitao , kernel-team@meta.com X-Mailer: b4 0.15-dev-a6db3 X-Developer-Signature: v=1; a=openpgp-sha256; l=4074; i=leitao@debian.org; h=from:subject:message-id; bh=poQ2ltGXAGj/R6azLC8+vFrV6fsBn4x8KuYNyoxOTxE=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBpFgtUh28966CZumXyyIbtdUKCDXVJ8AGRMjLUp wrz5B/DxWmJAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCaRYLVAAKCRA1o5Of/Hh3 bdFbD/982JwpeO4nF2jB9yp61nX7YvYeLYMRBYZfid29jOZd2WDNUdzO9NVNTaIVbKOZBn5xA1K waiTW2l04raQU0qsjerdzgOWGHtn1q9rYnu6WUN5vkXkocZCBfjfFYv9Cuf9UaEHU2NWgWBlbO3 UQatrdWD3FJmrx8ziHaw5u2Z4rYmrhmk8RVLh7SSAbU2zVatHBuMcyd35GMgduFkavNNMk4wMLS 6txW1fGu2VBmEhNbQEJJou+zK7K6jisiFpBqd3jS6k2VRyjCwFoJ+X8zhrQMgwB9YP85IiXTlWH JUCpk/ugnrlTbq58FjFjyUAv8AW+c/EB6e1HGLJWWT22MJtt5dmUkG/6rVDAT0vpRtPkYgt1wxG L+KtiYVC1kkCJpFlPWKpHCLNkzk+TShPOmo7kNjdUeVKpbDKX7Cw71m5PG8Xd1Eqa42n8Jfz1qG 4xTq6TRVw30lZO7oF2ZyHkQHmM8xfVh0pxq/cYgrBQvdWAuMyIMpkrxvhKF3yenZly5Juq5+QH6 Dn6pZhTcLMRZRfGja6Z5K7I435aXUUlb7TH1h/W4DdN4fmkzMM/LOlIR19/JcSjiQE8SnWkzJnh bbQDhhKDvL0w67oZG7T8g7VHZ3QtpsJNXvIyuPMp7k36nRXsbHMiw/qU1N2NoALz4N6xYXxvuHE j/fVWMcO1UlhFrw== X-Developer-Key: i=leitao@debian.org; a=openpgp; fpr=AC8539A6E8F46702CA4A439B35A3939FFC78776D Commit 84eaf4359c36 ("net: ethtool: add get_rx_ring_count callback to optimize RX ring queries") added specific support for GRXRINGS callback, simplifying .get_rxnfc. Remove the handling of GRXRINGS in .get_rxnfc() by moving it to the new .get_rx_ring_count() for both the mlx5 ethernet and IPoIB drivers. The ETHTOOL_GRXRINGS handling was previously kept in .get_rxnfc() to support "ethtool -x" when CONFIG_MLX5_EN_RXNFC=3Dn. With the new dedicated .get_rx_ring_count() callback, this is no longer necessary. This simplifies the RX ring count retrieval and aligns mlx5 with the new ethtool API for querying RX ring parameters. Signed-off-by: Breno Leitao Reviewed-by: Tariq Toukan --- drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c | 18 ++++++++------= ---- .../net/ethernet/mellanox/mlx5/core/ipoib/ethtool.c | 18 ++++++++------= ---- 2 files changed, 16 insertions(+), 20 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c b/drivers= /net/ethernet/mellanox/mlx5/core/en_ethtool.c index 01b8f05a23db..939e274779b3 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c @@ -2492,21 +2492,18 @@ static int mlx5e_set_rxfh_fields(struct net_device = *dev, return mlx5e_ethtool_set_rxfh_fields(priv, cmd, extack); } =20 +static u32 mlx5e_get_rx_ring_count(struct net_device *dev) +{ + struct mlx5e_priv *priv =3D netdev_priv(dev); + + return priv->channels.params.num_channels; +} + static int mlx5e_get_rxnfc(struct net_device *dev, struct ethtool_rxnfc *i= nfo, u32 *rule_locs) { struct mlx5e_priv *priv =3D netdev_priv(dev); =20 - /* ETHTOOL_GRXRINGS is needed by ethtool -x which is not part - * of rxnfc. We keep this logic out of mlx5e_ethtool_get_rxnfc, - * to avoid breaking "ethtool -x" when mlx5e_ethtool_get_rxnfc - * is compiled out via CONFIG_MLX5_EN_RXNFC=3Dn. - */ - if (info->cmd =3D=3D ETHTOOL_GRXRINGS) { - info->data =3D priv->channels.params.num_channels; - return 0; - } - return mlx5e_ethtool_get_rxnfc(priv, info, rule_locs); } =20 @@ -2766,6 +2763,7 @@ const struct ethtool_ops mlx5e_ethtool_ops =3D { .remove_rxfh_context =3D mlx5e_remove_rxfh_context, .get_rxnfc =3D mlx5e_get_rxnfc, .set_rxnfc =3D mlx5e_set_rxnfc, + .get_rx_ring_count =3D mlx5e_get_rx_ring_count, .get_tunable =3D mlx5e_get_tunable, .set_tunable =3D mlx5e_set_tunable, .get_pause_stats =3D mlx5e_get_pause_stats, diff --git a/drivers/net/ethernet/mellanox/mlx5/core/ipoib/ethtool.c b/driv= ers/net/ethernet/mellanox/mlx5/core/ipoib/ethtool.c index 4b3430ac3905..3b2f54ca30a8 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/ipoib/ethtool.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/ipoib/ethtool.c @@ -266,21 +266,18 @@ static int mlx5i_set_rxnfc(struct net_device *dev, st= ruct ethtool_rxnfc *cmd) return mlx5e_ethtool_set_rxnfc(priv, cmd); } =20 +static u32 mlx5i_get_rx_ring_count(struct net_device *dev) +{ + struct mlx5e_priv *priv =3D mlx5i_epriv(dev); + + return priv->channels.params.num_channels; +} + static int mlx5i_get_rxnfc(struct net_device *dev, struct ethtool_rxnfc *i= nfo, u32 *rule_locs) { struct mlx5e_priv *priv =3D mlx5i_epriv(dev); =20 - /* ETHTOOL_GRXRINGS is needed by ethtool -x which is not part - * of rxnfc. We keep this logic out of mlx5e_ethtool_get_rxnfc, - * to avoid breaking "ethtool -x" when mlx5e_ethtool_get_rxnfc - * is compiled out via CONFIG_MLX5_EN_RXNFC=3Dn. - */ - if (info->cmd =3D=3D ETHTOOL_GRXRINGS) { - info->data =3D priv->channels.params.num_channels; - return 0; - } - return mlx5e_ethtool_get_rxnfc(priv, info, rule_locs); } =20 @@ -304,6 +301,7 @@ const struct ethtool_ops mlx5i_ethtool_ops =3D { .set_rxfh_fields =3D mlx5i_set_rxfh_fields, .get_rxnfc =3D mlx5i_get_rxnfc, .set_rxnfc =3D mlx5i_set_rxnfc, + .get_rx_ring_count =3D mlx5i_get_rx_ring_count, .get_link_ksettings =3D mlx5i_get_link_ksettings, .get_link =3D ethtool_op_get_link, }; --=20 2.47.3