From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-oi1-f174.google.com (mail-oi1-f174.google.com [209.85.167.174]) (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 A6BBE49219B for ; Wed, 21 Jan 2026 15:56:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.174 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769010993; cv=none; b=beHeXz+QwlqYC24stqFYhTUSM9T1mmyb3Iku7cdhOyNWdWWcKuRAaYFhcXDb90FXyhmvHJxt7aD7Yx9Gm7bEnp15APmlaIeqwrDcYvI6zmcCrh1aeeCId89N1aGaCz78D0sCb+IDU4AvPrN2jFTpwZ+LEmj/tBdDl9AeIihgrm8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769010993; c=relaxed/simple; bh=xjfGrJ9ogmU02tXh4UwJsiacW3KcvGXHd/h59cpJCJU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=ZDF+T79clph55o8kI4k34ye/Uchytu5rHTKW2T3nBqvOdoaqymEvKqtjMTk8tiep6G16R1+pytQ8Mma5my8rKsU9VmDnc+NITrmL1AUhZB110J7ydQehi70Z399xfOU07E7QRpRI5YBlJSWyMmrwFNuS26BGgrSnjs3FeVsSF3s= 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.167.174 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-oi1-f174.google.com with SMTP id 5614622812f47-45c86087949so7228b6e.2 for ; Wed, 21 Jan 2026 07:56:29 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769010988; x=1769615788; 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=+Ieldrz0yCTZzK/huBW1mkitT5A3IA5rZUXCCnhdv+8=; b=XJ6DlGYAbDvWXJsffF+ZklO53gRaMnONI2UfQseP/h2g+JPnzVUkPDwTRmF4kp0xOo uei00kxzneZFYv6KbugnIzSQTje3DzGcxtfbKH22wZbxjtG8VSipW0w3M8MpblpcHfC7 ymV9VtKrTwdSSEYlmZgQxukj5GraRJzfs9cfo262Bo4sW1yn2JtMsnSyEkiC6wI9XV1U yA8py+Xo85knwTfPRdZrWSgFcwSGeUqD2EGad10noyYHi96FqjPW6gsw57lkgA8/1gBy 6evTLH6gvbGevfwvsvmpRK8Ydv10BrWC8hQ0Oe4RKAE0buT1xDTHB83GNzelFHMos2Wc 19Ig== X-Forwarded-Encrypted: i=1; AJvYcCW+yEBRGMMLTDdbqb6mlSjLcDVihYcUys+RI2bB2LWU7YvRggEVfKQnsK3a9zDQMksBAVwylm7hS+HCkcc=@vger.kernel.org X-Gm-Message-State: AOJu0YwUBzvD8CSkgC1XotlYduHKxsK+2M918qBga9BwzvuJkcU1hvir FlMAFGXxiXowcH4+jLZwzcdbWchT6rDyib7IjWkAn/5B5Anu/5KxTxvH X-Gm-Gg: AZuq6aLDm6BQxiigiBfGX/OCsVNIl0SCdbivlG1Zaa5/6p2xY15f4GGQUlS0KxWCcN6 KemZywBTh62fmEKy1b0pq/XrHdj245wCl4HaL+UxLXaP1bAdHK3yMJ9nmNXTK82DVtfPN1yfVev yuuqMsuBslRbXGM+HBMlu2GpcdbVVvgcqlpfaxeUqdhONE1PMcZZ6XTOOzEqOBFIV95NKKTJUPQ lTnx9kBtP5aM42jUpsug2TVOIEVDAdo8HoICRMOPRueX+uGhPYqoOyiDCfaEyq9wSgGeRLZxFLA 1nolxGf7tYyb9Ndofgvt3WfMNCbbOyVuEYqZ5wzRKxqNvltvzDgwjTetD16qBTeES0BYAk2Ra4U 2PxCRIcQ7sH9koHQzy5I2o+iHR4oIKJjs9VwpgtzEwV5lDYh2trxB4o964LNRXu9JcWx8Rr5ZD9 evqg== X-Received: by 2002:a05:6808:4f60:b0:450:b43b:3142 with SMTP id 5614622812f47-45c9d929969mr7203814b6e.67.1769010988269; Wed, 21 Jan 2026 07:56:28 -0800 (PST) Received: from localhost ([2a03:2880:10ff:49::]) by smtp.gmail.com with ESMTPSA id 586e51a60fabf-4044bb545b9sm11333368fac.9.2026.01.21.07.56.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Jan 2026 07:56:27 -0800 (PST) From: Breno Leitao Date: Wed, 21 Jan 2026 07:54:45 -0800 Subject: [PATCH net-next 8/9] net: sfc: siena: convert to use .get_rx_ring_count 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: 7bit Message-Id: <20260121-grxring_big_v4-v1-8-07655be56bcf@debian.org> References: <20260121-grxring_big_v4-v1-0-07655be56bcf@debian.org> In-Reply-To: <20260121-grxring_big_v4-v1-0-07655be56bcf@debian.org> To: Ajit Khaparde , Sriharsha Basavapatna , Somnath Kotur , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Igor Russkikh , Simon Horman , "K. Y. Srinivasan" , Haiyang Zhang , Wei Liu , Dexuan Cui , Long Li , Alexander Duyck , kernel-team@meta.com, Edward Cree , Brett Creeley Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, oss-drivers@corigine.com, linux-hyperv@vger.kernel.org, linux-net-drivers@amd.com, Breno Leitao X-Mailer: b4 0.15-dev-47773 X-Developer-Signature: v=1; a=openpgp-sha256; l=2810; i=leitao@debian.org; h=from:subject:message-id; bh=xjfGrJ9ogmU02tXh4UwJsiacW3KcvGXHd/h59cpJCJU=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBpcPciGOYn92BaHKmt39fyKEVo/6aqUOA9Owk6p ALiwAeiGYiJAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCaXD3IgAKCRA1o5Of/Hh3 bc4MD/9ApFcQWd4wCB0+XaKw9CUrjtiZ1/9w1xeC9mclcB8VU1LWhvZi6l93u+gdbsGC3CVvxOb KWMuwCUfv2vCmHtCO1tgnOfoBbhNo810fO2p/s9+d9UXFzFzYqac2Vlq4jxziJt1zmdReIEqq5A XGvZhBUFypdT+SSuRv49IHaqa2V/uhij6GsqG9yQ3z8qfFdmBfVpROwLpegk7fN8Jq3CE+DGrJW 0z+/AB3dmcPipLHEYC0ackpMW5obztm4RaYWfa+OTpUF/xMKuZncQbyIbMOJIrjT4lBtp4f+kZi JUAwSf3S+JGca00Zg6tSWAwCDYZLEHZiT4HLyZh2i0buOK+VaheoCG0XINc9R72iPUKfaHvSt/l m/74NmveJRxiC9JY8Hq3ifpjSYO2FgKxkJyUBk1Df2ZMG3mgos3mDJALwsb7hwLwDER4bSEc3ef 3s6t0LOuhtHWySesMhP/KNzpMjsXIT/IX2gN6rQJvfNin3tTf2TwhUJPMpEAhOJo0QRDW/ZRiZG nUScCW8hoG4+3Fg8EryXKxCyeOjKjlAinPwFSybRFrwK+dbG7TLD7fQ9rThlgct2c9AFhIP4Z3q C5RdMmMgaJZ9S6ojA0iQpxdEYKif6POwplsweLpL46MyBow2BGMDbxOiWysh5Ztj0H9r/aAFEar 3sJgShl9z7rgdvQ== X-Developer-Key: i=leitao@debian.org; a=openpgp; fpr=AC8539A6E8F46702CA4A439B35A3939FFC78776D Use the newly introduced .get_rx_ring_count ethtool ops callback instead of handling ETHTOOL_GRXRINGS directly in .get_rxnfc(). Signed-off-by: Breno Leitao --- drivers/net/ethernet/sfc/siena/ethtool.c | 1 + drivers/net/ethernet/sfc/siena/ethtool_common.c | 11 +++++++---- drivers/net/ethernet/sfc/siena/ethtool_common.h | 1 + 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/sfc/siena/ethtool.c b/drivers/net/ethernet/sfc/siena/ethtool.c index 8c3ebd0617fb1..36feedffe4444 100644 --- a/drivers/net/ethernet/sfc/siena/ethtool.c +++ b/drivers/net/ethernet/sfc/siena/ethtool.c @@ -261,6 +261,7 @@ const struct ethtool_ops efx_siena_ethtool_ops = { .reset = efx_siena_ethtool_reset, .get_rxnfc = efx_siena_ethtool_get_rxnfc, .set_rxnfc = efx_siena_ethtool_set_rxnfc, + .get_rx_ring_count = efx_siena_ethtool_get_rx_ring_count, .get_rxfh_indir_size = efx_siena_ethtool_get_rxfh_indir_size, .get_rxfh_key_size = efx_siena_ethtool_get_rxfh_key_size, .get_rxfh = efx_siena_ethtool_get_rxfh, diff --git a/drivers/net/ethernet/sfc/siena/ethtool_common.c b/drivers/net/ethernet/sfc/siena/ethtool_common.c index 47cd16a113cf1..c56e0b54d8541 100644 --- a/drivers/net/ethernet/sfc/siena/ethtool_common.c +++ b/drivers/net/ethernet/sfc/siena/ethtool_common.c @@ -841,6 +841,13 @@ int efx_siena_ethtool_get_rxfh_fields(struct net_device *net_dev, return 0; } +u32 efx_siena_ethtool_get_rx_ring_count(struct net_device *net_dev) +{ + struct efx_nic *efx = netdev_priv(net_dev); + + return efx->n_rx_channels; +} + int efx_siena_ethtool_get_rxnfc(struct net_device *net_dev, struct ethtool_rxnfc *info, u32 *rule_locs) { @@ -849,10 +856,6 @@ int efx_siena_ethtool_get_rxnfc(struct net_device *net_dev, s32 rc = 0; switch (info->cmd) { - case ETHTOOL_GRXRINGS: - info->data = efx->n_rx_channels; - return 0; - case ETHTOOL_GRXCLSRLCNT: info->data = efx_filter_get_rx_id_limit(efx); if (info->data == 0) diff --git a/drivers/net/ethernet/sfc/siena/ethtool_common.h b/drivers/net/ethernet/sfc/siena/ethtool_common.h index 278d69e920d9f..7b445b0ba38aa 100644 --- a/drivers/net/ethernet/sfc/siena/ethtool_common.h +++ b/drivers/net/ethernet/sfc/siena/ethtool_common.h @@ -37,6 +37,7 @@ int efx_siena_ethtool_set_fecparam(struct net_device *net_dev, struct ethtool_fecparam *fecparam); int efx_siena_ethtool_get_rxnfc(struct net_device *net_dev, struct ethtool_rxnfc *info, u32 *rule_locs); +u32 efx_siena_ethtool_get_rx_ring_count(struct net_device *net_dev); int efx_siena_ethtool_set_rxnfc(struct net_device *net_dev, struct ethtool_rxnfc *info); u32 efx_siena_ethtool_get_rxfh_indir_size(struct net_device *net_dev); -- 2.47.3