From nobody Mon Feb 9 06:27:55 2026 Received: from mail-oa1-f47.google.com (mail-oa1-f47.google.com [209.85.160.47]) (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 243347640E for ; Thu, 15 Jan 2026 14:38:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768487901; cv=none; b=ZuPO28HLp99ArtYY4P4ZIl84pbAr30iIAWO1HUmi2OEpBrFwV0qPb4xnJoII569BUrlbrUTcd6vhYfXY8RVSi2dXBzL0J0WKi0I6zJVT9eAvlzP2TFQkiyw4Xj5ZK4TxMzZ75G8a5dzfivb7+c93BUx19UERj9z4GhvXzsS4n2M= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768487901; c=relaxed/simple; bh=ho090fN91gnMOR0nUR4Y+EcFIXlQvnkEfyY6PgYidL0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=ECW8eKBtOjiIfre2j6iLyx01/OpPk1C0bBY2UyvkCy130AI/iXx3DMnOS/KboDuJnKIIO/4j3pQOfVkorE2tfjN2boNK5xoNWcPomIVK7Vzfa27cCT8UGb1LQVVujrwh8qPrjl4jU06CGpet4b4hYzOskpNVwgw9Q1DXTpKcQ/U= 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.160.47 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-oa1-f47.google.com with SMTP id 586e51a60fabf-404254ffe8aso728211fac.0 for ; Thu, 15 Jan 2026 06:38:17 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768487894; x=1769092694; 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=bxQOvp3FO/FV+ivIiwVToR8TzMNrudoK/UpMDqV1B+s=; b=hM/1BRS/E1GBgl2ELiCzQ3Z21Yphr8ThPTh8n3v55znPI4embVSjYY7aYIU/X7Plf3 a+PzvFMuD6H89qNFl67043UCqjbK/nToguk+QGwG+oKQ3DjGslGYbEi1Oa73PnwLKBiG /0pQ7boX7kZDl+JeH+Q61SJdJWmIGSDOWTkqzQoy75LOBYF8iA+cnu5rtIXXa6tIeXlS oh04I9IWKe3wd/HPHgfcR9d0EDiNRAyhccBGdo874dUTnnO/nqbC3y6rc3RLyfePwSKM pbH4QsNmUjTONWQFxFvrIlKjTLcn8zSvHaHIeHfSOd0Wgvu+MXm7nELY19O4lE0mWFdu fCvQ== X-Forwarded-Encrypted: i=1; AJvYcCVmP3Frqg3GMawKjIMfmFw1W4YjQYd6Zx2/Tp2uH4YAq03fNgLhf8HS1fdUrTpUPijc9kBrFu2E4gfFe4E=@vger.kernel.org X-Gm-Message-State: AOJu0Yz7/5SVp8rvtru4IOU0o/sCr+rP6FNNbvs+AuIomdv9qjadrS1g ywiP+6CNxi9nIIcrUu1AhcS/g5eGyKegujrZ7JupPG8KWVtK+8RxMnsO X-Gm-Gg: AY/fxX4N/gij6VojhBmU7vc8O0GsP0tBOPTeJg3Y1xF1V7GvXa/53MpKCmgI76mAI+D bg3brCVRcfgrwoujE+cnf2q1W3sYbR61WdL0imTXNEmVHGTpCy8zSV7VFGousFqjlpHZM5Qn835 Qb71qaOaB4PzSnPb5YkVZjQrL8j7cyQyTGHUT/D+gxUEEtlqUWXFfiBk9VfDmLuUHBLimwzxy3Y cabHoVH8Q96Iv1R+iCWiEqwPmlPKbQdh/BILsMeWUgTeSfrJfMGUaiFphmCl2hT98D88IJ7WMDw JOKQKQlOzLhzvTGZptJziIIFDqUK7DaSuWiJPA+KWkOBtESgRL88n4b1U+Dt48RCmX2dgR/yPOH 5LmeMUV+VOs2l8ZFFeSunfGexc0Hp+Lp3M8NKQpWBmhkmvKAg21nJi3SdTVSNZJN9GiqVROBAx0 1pig== X-Received: by 2002:a05:6870:f10c:b0:3f6:1e6:d0dc with SMTP id 586e51a60fabf-404291e9118mr2182430fac.16.1768487893377; Thu, 15 Jan 2026 06:38:13 -0800 (PST) Received: from localhost ([2a03:2880:10ff:5a::]) by smtp.gmail.com with ESMTPSA id 586e51a60fabf-40414c5d332sm3357458fac.20.2026.01.15.06.38.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Jan 2026 06:38:12 -0800 (PST) From: Breno Leitao Date: Thu, 15 Jan 2026 06:37:48 -0800 Subject: [PATCH net-next 1/9] net: benet: 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: quoted-printable Message-Id: <20260115-grxring_big_v2-v1-1-b3e1b58bced5@debian.org> References: <20260115-grxring_big_v2-v1-0-b3e1b58bced5@debian.org> In-Reply-To: <20260115-grxring_big_v2-v1-0-b3e1b58bced5@debian.org> To: Ajit Khaparde , Sriharsha Basavapatna , Somnath Kotur , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Felix Fietkau , Sean Wang , Lorenzo Bianconi , Matthias Brugger , AngeloGioacchino Del Regno , Shay Agroskin , Arthur Kiyanovski , David Arinzon , Saeed Bishara , Bryan Whitehead , UNGLinuxDriver@microchip.com, Shyam Sundar S K , Raju Rangoju , Potnuri Bharat Teja , Nicolas Ferre , Claudiu Beznea , Jiawen Wu , Mengyuan Lou Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, Breno Leitao X-Mailer: b4 0.15-dev-47773 X-Developer-Signature: v=1; a=openpgp-sha256; l=2204; i=leitao@debian.org; h=from:subject:message-id; bh=ho090fN91gnMOR0nUR4Y+EcFIXlQvnkEfyY6PgYidL0=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBpaPvREfl1vVTFd9VCzNZLXGv4qdGXI1B9s775w CRZVlDxz92JAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCaWj70QAKCRA1o5Of/Hh3 bRjCEACa04xXzzhEph5wulMAMymz5V6/MzKrLa6K9yiJeFzArG7sXYRape5HeOReDq/e1HtKQOD U5MlsKbmvFNXwZ0RU3HbBarbRX/r71YAnp2Zi+LoQVbMmifAyizczt9GzkEnWCVMKtvrd4M0Gpz NKSJQVdwgwAXY7LucPNj7NgoP7eOpYo7uL5iWWlDWb5ZueFIkU3eNQhPUmQFm9hdke9eGtZBif0 qRND+fwHDtZt/96hhvbByIcXEuK54DdcIa2UsGU45hQYBSfSauFX0dOuwkI4PIwpVpfIsA73ZF3 QHj2c1fD5a1B+Op7EEgmkUkBOnr2VXcB3nupJr42Q0lF0hQ2Kb/+V0o8ZqUstXEHhOFL8/cXHtc l1s36gb4ruqXR4UVMgHIY2/YvCJ1kVBwmU4n0Y7iPkPH2AuYACRrH4sveEATGszfob5/Yj8DFxJ QbRzhTDaXCMTCPcgBLOwTpJOXmqwPRvI3Ml2OwpHl+xxw8YEM/HrGy3+7Rgc5n7HERJp4knxX6u lr5QlKFLr1F11yTZdvdTrfamoTW1d/xJnZ2lu+74x70tKhKzv/6WycPoiG0RPm8BL0Wvi7ylid1 AaM5Q7zzsvcp88wLuZ7mZvtsX6k8Mtou08w2vVmA1wxAFiNysONe64i/DYxl9+AS98kdSD/LFv9 7Ro847D2vuFjy1w== 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(). Since ETHTOOL_GRXRINGS was the only command handled by be_get_rxnfc(), remove the function entirely. Signed-off-by: Breno Leitao --- drivers/net/ethernet/emulex/benet/be_ethtool.c | 31 +++++++---------------= ---- 1 file changed, 8 insertions(+), 23 deletions(-) diff --git a/drivers/net/ethernet/emulex/benet/be_ethtool.c b/drivers/net/e= thernet/emulex/benet/be_ethtool.c index f9216326bdfe..4717a1dacbe2 100644 --- a/drivers/net/ethernet/emulex/benet/be_ethtool.c +++ b/drivers/net/ethernet/emulex/benet/be_ethtool.c @@ -1073,6 +1073,13 @@ static void be_set_msg_level(struct net_device *netd= ev, u32 level) adapter->msg_enable =3D level; } =20 +static u32 be_get_rx_ring_count(struct net_device *netdev) +{ + struct be_adapter *adapter =3D netdev_priv(netdev); + + return adapter->num_rx_qs; +} + static int be_get_rxfh_fields(struct net_device *netdev, struct ethtool_rxfh_fields *cmd) { @@ -1117,28 +1124,6 @@ static int be_get_rxfh_fields(struct net_device *net= dev, return 0; } =20 -static int be_get_rxnfc(struct net_device *netdev, struct ethtool_rxnfc *c= md, - u32 *rule_locs) -{ - struct be_adapter *adapter =3D netdev_priv(netdev); - - if (!be_multi_rxq(adapter)) { - dev_info(&adapter->pdev->dev, - "ethtool::get_rxnfc: RX flow hashing is disabled\n"); - return -EINVAL; - } - - switch (cmd->cmd) { - case ETHTOOL_GRXRINGS: - cmd->data =3D adapter->num_rx_qs; - break; - default: - return -EINVAL; - } - - return 0; -} - static int be_set_rxfh_fields(struct net_device *netdev, const struct ethtool_rxfh_fields *cmd, struct netlink_ext_ack *extack) @@ -1441,7 +1426,7 @@ const struct ethtool_ops be_ethtool_ops =3D { .get_ethtool_stats =3D be_get_ethtool_stats, .flash_device =3D be_do_flash, .self_test =3D be_self_test, - .get_rxnfc =3D be_get_rxnfc, + .get_rx_ring_count =3D be_get_rx_ring_count, .get_rxfh_fields =3D be_get_rxfh_fields, .set_rxfh_fields =3D be_set_rxfh_fields, .get_rxfh_indir_size =3D be_get_rxfh_indir_size, --=20 2.47.3 From nobody Mon Feb 9 06:27:55 2026 Received: from mail-oa1-f51.google.com (mail-oa1-f51.google.com [209.85.160.51]) (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 1620A378D92 for ; Thu, 15 Jan 2026 14:38:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768487904; cv=none; b=hAzS6XhmhVtVg0PPakNsrlm7kPA9Dt0e56pDZkbq5c/ZVDmBMHbJIXiKF7uRWeb2Go5cw1zb16+ljZYOeFecslavJ2RJzHWkdCoinat3bifQZGkpP2QfdDKqUoFcH3kEcyRFbbWdy4Zkq5A/NFFiIr13Sq3NYZjkQg3CM34Lj50= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768487904; c=relaxed/simple; bh=VqwV07kQH4CtC2dzFBLL5ZX1yoUM3ruiZh1l3J4At1o=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=bW40W/w+WW+I2jaIxXMHn1KdBQ+Oh5Mq6zrmSN6MGfQc3XXgCTLQ8iCucVvcve5Hi0jBecUnZ6kIDQgbizKtzsk6zg7pFlIC5/rqpmcriWxrzDz2cPBaN2sh99MJYXWOgJMaJ69eRZm08R+R7XJDAV5YT0TKp1zZtrxfQYYypvo= 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.160.51 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-oa1-f51.google.com with SMTP id 586e51a60fabf-4042f55de3aso640087fac.1 for ; Thu, 15 Jan 2026 06:38:17 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768487894; x=1769092694; 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=n4pj0G+Abgyush+HjB0g/8sWijDo1hvace6ej6tDD+M=; b=p0VUjKUSnm3t2WLc8WmfCBFACJIknpZylct3wJ4BL5f4zijfJCY6neKuq4sC3oJILI 8lejkG9QUPQ6fJeDHg1RnFN8QE/OSf/zlTYcigw7D/sK0nfzk6ELgDJMN0CmGSopMJ9a sV/vhpa5+CujIRwi9LqotgW/ZXTc/rsdAvZ2fdqrJpsYgb++ckAAUdIypGn5f11r6d0v XGnlpBgQqYqKvCiZ5PJY2BsZFf6ubPfna6vyyaF0p231MO8syOuZv4can9byIPavtfu1 S2WjChhyfM7lF8Zhw4Ucr4xwI0SPJVlBpj5MaNC/nM75+VdqiDfgG06VZ22Np7qo1/t8 B9aA== X-Forwarded-Encrypted: i=1; AJvYcCW9/ufAyMD/AD7EBmlBbaPUcpjdvupPgKBHWmmLpQeyJir9lhUewuA679Ed0eSerRSu1hj+ecU6POV+qQY=@vger.kernel.org X-Gm-Message-State: AOJu0YyUHIFAi+EB4UvGsVmvzuCraqSO95e87qPjQ72X2uqCoQp2rvr/ V6grjiE2uAKLhD4mtS28SLeVmsxxEvN+LF91WEhCz6Zp48SQFUTgAV/K X-Gm-Gg: AY/fxX5ecGpMiXBzS5YZ9uYvCc82xFyBAkiBLMYFlGa55CaFDexrHGyEjRZKK8Wjous 1OBqoW1UkGnlIcbd6fY8JaIOHvAH0zcEz3x9p3fq3cgzQBHAn3/Q1B8FEVGO0NO0Q2GZh4/3Kny YTfIz5E5vS+ADDe/EAM32wCd7asHK4l3zEnBVO7faBo4XAojuZ60bwceFVmSfNS26P3xvnbJAVy 5dce/rBNP9Z+BgQd0KZZmInhSK4rDb4TmdSeDrLgcAGtZ2htvB9EZsZFQt9EuuWzuH6Qifc0IKP +f/uLdvps0IfV4Pd3/TWHQZwrDmYsugmrk590Z+afKHB8NDqQWdY9AQ72cqDTxdWayuCyKb/VeJ fl+IDtToUPJU4YOkPqBaVc9lda2Qbiy7XeRJ8Fq7rdLjeZqDtkoqJo2H+NLfhFwmA0n9nFJYMgp L50w== X-Received: by 2002:a05:6871:e2d7:b0:3ff:c029:d24c with SMTP id 586e51a60fabf-40429044c12mr1905592fac.17.1768487894611; Thu, 15 Jan 2026 06:38:14 -0800 (PST) Received: from localhost ([2a03:2880:10ff:42::]) by smtp.gmail.com with ESMTPSA id 586e51a60fabf-4040cba2d2asm3965570fac.5.2026.01.15.06.38.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Jan 2026 06:38:14 -0800 (PST) From: Breno Leitao Date: Thu, 15 Jan 2026 06:37:49 -0800 Subject: [PATCH net-next 2/9] net: tsnep: 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: quoted-printable Message-Id: <20260115-grxring_big_v2-v1-2-b3e1b58bced5@debian.org> References: <20260115-grxring_big_v2-v1-0-b3e1b58bced5@debian.org> In-Reply-To: <20260115-grxring_big_v2-v1-0-b3e1b58bced5@debian.org> To: Ajit Khaparde , Sriharsha Basavapatna , Somnath Kotur , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Felix Fietkau , Sean Wang , Lorenzo Bianconi , Matthias Brugger , AngeloGioacchino Del Regno , Shay Agroskin , Arthur Kiyanovski , David Arinzon , Saeed Bishara , Bryan Whitehead , UNGLinuxDriver@microchip.com, Shyam Sundar S K , Raju Rangoju , Potnuri Bharat Teja , Nicolas Ferre , Claudiu Beznea , Jiawen Wu , Mengyuan Lou Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, Breno Leitao X-Mailer: b4 0.15-dev-47773 X-Developer-Signature: v=1; a=openpgp-sha256; l=1647; i=leitao@debian.org; h=from:subject:message-id; bh=VqwV07kQH4CtC2dzFBLL5ZX1yoUM3ruiZh1l3J4At1o=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBpaPvRXdQiLep1rFYIYQ2D4H5vs5OvolAtazC0M O/7iI/pc/uJAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCaWj70QAKCRA1o5Of/Hh3 bdcNEACK6R+vJJPtW8yLH04hKVq5d3PRhPSvRYiADaz5srmrMsfCXAVavitSAfOLb29EpgQlEef 6I95MtC+vloxjsg+uluNGS/j5LTm2U3A8fHWijO3PQXNngVL1c5I+rBBBWZQqJEb3UEaKgtIBKz MLowyR2FFvubs0MEGXemyyR67ofdf5CtNDGpd8TPz0WmBkjX8DJ7bvjqG6mZ624T00ODQWAY2lv PHEMcm9ZfccLDCJiQhRk5+gdrSjED1Gz9+Ku5yOPue7p6ArvHR1z4vDWrjVgtMBs4I/l6P39tw9 lsHE4X+ZRFztAZam0EzU1nF/0n1idvfdRN9boefz6WwwnzShz0tpgvq8U6BW8PoEFFLeGfeW1PG fmzmZSWz7D5RcOiTubf/h7/+vqsk7bD1EDJwVBanoEUYv8J+rbRSGgye321FGo/6hPSIW8gYB8a OodoPKdZoNLbib5yL+VPTnXSjFn0uilyPPw/Vsb7HF+E/nEtd+0qLUlpUue93flveq8kf/6OggZ 43tIwDvSUydlJEGQfOAEbIC0eh1u+fuLacrxoxvTJKaT79Ea0gWw8/5n/cxTOBj3NOX2URG2UDK yqsKFU04o2wH1tFSJTpwYsNEY+KGV+igZGmLK76DdcwsVlIXCevVKZ6+SMQsluSW7n26vLg4fWE Q+QEg46BHDlNhlw== 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/engleder/tsnep_ethtool.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/engleder/tsnep_ethtool.c b/drivers/net/et= hernet/engleder/tsnep_ethtool.c index 228a638eae16..d11168278515 100644 --- a/drivers/net/ethernet/engleder/tsnep_ethtool.c +++ b/drivers/net/ethernet/engleder/tsnep_ethtool.c @@ -257,15 +257,19 @@ static int tsnep_ethtool_get_sset_count(struct net_de= vice *netdev, int sset) } } =20 +static u32 tsnep_ethtool_get_rx_ring_count(struct net_device *netdev) +{ + struct tsnep_adapter *adapter =3D netdev_priv(netdev); + + return adapter->num_rx_queues; +} + static int tsnep_ethtool_get_rxnfc(struct net_device *netdev, struct ethtool_rxnfc *cmd, u32 *rule_locs) { struct tsnep_adapter *adapter =3D netdev_priv(netdev); =20 switch (cmd->cmd) { - case ETHTOOL_GRXRINGS: - cmd->data =3D adapter->num_rx_queues; - return 0; case ETHTOOL_GRXCLSRLCNT: cmd->rule_cnt =3D adapter->rxnfc_count; cmd->data =3D adapter->rxnfc_max; @@ -469,6 +473,7 @@ const struct ethtool_ops tsnep_ethtool_ops =3D { .get_sset_count =3D tsnep_ethtool_get_sset_count, .get_rxnfc =3D tsnep_ethtool_get_rxnfc, .set_rxnfc =3D tsnep_ethtool_set_rxnfc, + .get_rx_ring_count =3D tsnep_ethtool_get_rx_ring_count, .get_channels =3D tsnep_ethtool_get_channels, .get_ts_info =3D tsnep_ethtool_get_ts_info, .get_coalesce =3D tsnep_ethtool_get_coalesce, --=20 2.47.3 From nobody Mon Feb 9 06:27:55 2026 Received: from mail-oa1-f52.google.com (mail-oa1-f52.google.com [209.85.160.52]) (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 B6711313E13 for ; Thu, 15 Jan 2026 14:38:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768487904; cv=none; b=AoeaDEEXEHmYw2R9aicSHC64AEsbckRG881vfrB4vimlUvQVAKhBSnXXlI3rk+HQJFsmL6tHhFJLMAiEaRj6rouR50Amtf24gqf0sSMmTYSzbqczIagV1WThE37B8oQWYPcxZzMjDiJ1cht4n0998ZA6QI8yECb2rTYPRzaifx8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768487904; c=relaxed/simple; bh=dAvRCGWtWrgyCIbjzXr78wi4bL8QADGL+zFdAiYR2bc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=jMBdDrM/mgjSDPH9zwZB0URzCb4a8rorrR7IDqHpxoRtvafUofxzUgHq+z6XrIWLQbt9mOJ8JPdPEWDKiEVDxwIOot/p4E5Ay/aoBUxdnlI5qwxMuINgvkhdAtVDTW34hLUJBHJRS4409/aM9xM28NUGyyXx1DChsumSpYydzj4= 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.160.52 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-oa1-f52.google.com with SMTP id 586e51a60fabf-3f5aaa0c8d7so777033fac.3 for ; Thu, 15 Jan 2026 06:38:17 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768487896; x=1769092696; 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=J/FeA4DjIpvihRKqOOPncXjlCgByUn4v1i0+sGL5vbs=; b=JhOHXGe08KqF2raQb+8ZBDKUNxrRxVfz0pfBPecUVsgBRlG5pkBwNGdrAUwoYvEril Bpu0R+0ZoDWUTHp5Aa5mKYt0JkSC+krZ3WPmvY60++JtO89um+rsze2cDiJ8aS/imnyR HeAgqovGTkF5kG+2ldfQjubs5426urN/EEiCEHcmtAg+ekkm24eoMpLnFjWUi0Uanyzw 3FWmL4Gs6DyA2QUfayshrFPvnHTHVxMXqTq3/XRM0xo5Ynvhiflerg8oyx2sw32sjVcF IPp+k/Vo+6UP/6Mhv87FN/Rky+xJllytoGGo6oPM9l708J9lm6LDo9qYrAjB6WKgBuat 3Iew== X-Forwarded-Encrypted: i=1; AJvYcCVGO7CTu/M05qLyWljBudljxA4vSQbyc2L5UCKgmMSW1eeT7WRcRze48kX2YoIt+GuF4pe189GKVAOd2ZU=@vger.kernel.org X-Gm-Message-State: AOJu0Yz3blg87zblGX/u1F+wBMwMz++x2Ks9G36T2fB/b8fVpVmVAly9 UPZgDFCooexKdHvfdUQ55+w3Zu6C3EVKOJLeTScVvT5Anm0A51puDvJ0 X-Gm-Gg: AY/fxX4vwT8LNXkw3+l/Fm57Npw4d5dBNng9BP/Zv99N2rxUa+zaJdoIZC4RL+op+Ep HeBeeCpj7AdtMeT6wivCl6nd9XSgzvPw9xaasTwsZWWL8h2o1ipmsLkvPHDiUhJvW1+I+S5uedB O7CUSJofH7OLa4Vh9DSsTeEFvBW1Kmfe5I1O6Pxb8ry9JjZH2gSzgqu6+sef94KHFNbnHbJN6rJ 8yxnP5e8FD+pNWfyOls5Mzi24AX9dvZeXFLalVV61xSUFZSig+HZ23z3KG4MGs93WnXwbaTL67B 3XKbMh39T5fbv9ES6hTa7pGMLug2xs4AzJWh2Ew9TflpXkZ/2a0bwa6WU9FKZAkcK466gIV+Sbv u0vJykSmPCntMlA+1O3JsDgSIJsvJhSYDUZEH0uppnbrUlpnsWNJc/IZaQXqtmqXrng53TLTsPN EcWoRqs2DNSEI8 X-Received: by 2002:a05:6871:2211:b0:3d4:760f:544b with SMTP id 586e51a60fabf-4040716055bmr4253866fac.46.1768487895761; Thu, 15 Jan 2026 06:38:15 -0800 (PST) Received: from localhost ([2a03:2880:10ff:4a::]) by smtp.gmail.com with ESMTPSA id 586e51a60fabf-4040997ffacsm3714947fac.6.2026.01.15.06.38.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Jan 2026 06:38:15 -0800 (PST) From: Breno Leitao Date: Thu, 15 Jan 2026 06:37:50 -0800 Subject: [PATCH net-next 3/9] net: mediatek: 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: quoted-printable Message-Id: <20260115-grxring_big_v2-v1-3-b3e1b58bced5@debian.org> References: <20260115-grxring_big_v2-v1-0-b3e1b58bced5@debian.org> In-Reply-To: <20260115-grxring_big_v2-v1-0-b3e1b58bced5@debian.org> To: Ajit Khaparde , Sriharsha Basavapatna , Somnath Kotur , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Felix Fietkau , Sean Wang , Lorenzo Bianconi , Matthias Brugger , AngeloGioacchino Del Regno , Shay Agroskin , Arthur Kiyanovski , David Arinzon , Saeed Bishara , Bryan Whitehead , UNGLinuxDriver@microchip.com, Shyam Sundar S K , Raju Rangoju , Potnuri Bharat Teja , Nicolas Ferre , Claudiu Beznea , Jiawen Wu , Mengyuan Lou Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, Breno Leitao X-Mailer: b4 0.15-dev-47773 X-Developer-Signature: v=1; a=openpgp-sha256; l=1572; i=leitao@debian.org; h=from:subject:message-id; bh=dAvRCGWtWrgyCIbjzXr78wi4bL8QADGL+zFdAiYR2bc=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBpaPvRK7lb2WvUAPqaQKV1+ODpLebJeMp5bYV+Z NGd9H0VU2uJAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCaWj70QAKCRA1o5Of/Hh3 bSgUD/94DPM5bKVosd7hSCjQw9XhbrFa34AvpHooSQCwpmP0Abk5I+Rh+hYzUDUq0QQV/wSU95b CJ6l2SNhGUWoWw3CrFPm80hM6b3RIl6KN0aAsDiaVWMUrbN+KNbT3yEZp73aIHS8o/OxNFuVzmo Yuaz7rZ9ekX+FvaUabuLH/dFnmrMGQ5r0AYhTBGOMn5mMtab0Rx7SidFT5AWsXJGb5SSu4S6AVM ROPo81FwQsyWgssFN9PiKK19CzyjkMsmSag/Bwi/h50v7tjlNZO+WCcrcFhCQfchKXz2+Plk/0C xDGaZ5E90LuNVi916p4rNFr8qc3x8uza4tF9RdurlbPNtKVxbQe6vaFyD2iwpo3p14/XQu+tbk+ nrJmVj7ro9woJ1ukGdJ2WQEppydsccRtXmOpCuYFPwFfKjigX2c5SVumJtB2W5JUtWRfOXDF3oF 4HVB/iPaNvLUgH5TzULt6Z3DNCh8d26NSPGspqxMsWndDHfZOjcG6ywIDyI78FCG2fvihxNpGc3 Ed3ljL/dQPx0Y/nEdviEtGnaD1/d3fBTy3KwjAqIstvw8FEqLPPtLomDZHeyhaO7gB0zmRCH+1h Et4JOHjw0ZttjoVW83jemJG1OUmKM06SyamadYHRvSfaaW6aPAvPQQ/sDuW8WlsSRrTiLcICFNK fjUU/Z4OqxvNkzg== 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/mediatek/mtk_eth_soc.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.c b/drivers/net/ethe= rnet/mediatek/mtk_eth_soc.c index e68997a29191..99abec2198d0 100644 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c @@ -4625,18 +4625,20 @@ static void mtk_get_ethtool_stats(struct net_device= *dev, } while (u64_stats_fetch_retry(&hwstats->syncp, start)); } =20 +static u32 mtk_get_rx_ring_count(struct net_device *dev) +{ + if (dev->hw_features & NETIF_F_LRO) + return MTK_MAX_RX_RING_NUM; + + return 0; +} + static int mtk_get_rxnfc(struct net_device *dev, struct ethtool_rxnfc *cmd, u32 *rule_locs) { int ret =3D -EOPNOTSUPP; =20 switch (cmd->cmd) { - case ETHTOOL_GRXRINGS: - if (dev->hw_features & NETIF_F_LRO) { - cmd->data =3D MTK_MAX_RX_RING_NUM; - ret =3D 0; - } - break; case ETHTOOL_GRXCLSRLCNT: if (dev->hw_features & NETIF_F_LRO) { struct mtk_mac *mac =3D netdev_priv(dev); @@ -4741,6 +4743,7 @@ static const struct ethtool_ops mtk_ethtool_ops =3D { .set_pauseparam =3D mtk_set_pauseparam, .get_rxnfc =3D mtk_get_rxnfc, .set_rxnfc =3D mtk_set_rxnfc, + .get_rx_ring_count =3D mtk_get_rx_ring_count, .get_eee =3D mtk_get_eee, .set_eee =3D mtk_set_eee, }; --=20 2.47.3 From nobody Mon Feb 9 06:27:55 2026 Received: from mail-ot1-f42.google.com (mail-ot1-f42.google.com [209.85.210.42]) (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 15D8B361DA3 for ; Thu, 15 Jan 2026 14:38:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768487903; cv=none; b=TEd9XWC5VJj9RMFTo+ur6br4cm8ZclWlm2vvq+hctyPBQcDdNNuPIordKLi5DuscHxz6YL3fj/i3LqqZ5XNJuJYpjCgM0d/l0MjUZVxYISoKWPnI+L9NB8ERfAGSJLNZJSePWjWww9/M1+Hr84aUdu0AEvGg7mY2H5JIffN5VBQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768487903; c=relaxed/simple; bh=OhOSJKzo23oetHtU1SAjOSl7/D+75LUpKZ4+ls31geY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=DsJkrCaks72vpX/hSE6434vlfYXgtUrgeJIAWsusBABaQ1xDajYlsbLMqbS1x2Gjr5C9L3pxVlZEZPl2YsFlwRufoTeEl1g3PFseRRZsTD/gTS5Et7Ss7P+ZhypPi1rmbn6CkYFNAzZumS2IQ0WyRnWfOuSV220heLC5Az3hDow= 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.42 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-f42.google.com with SMTP id 46e09a7af769-7cfd6f321b5so456219a34.2 for ; Thu, 15 Jan 2026 06:38:19 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768487897; x=1769092697; 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=DoyxLPjnBq1qhMQoPjoZ2qS39Mdd35mOR6xZOmQK8KY=; b=fdgsdnVn6mXGU7EiTz0zyI3xSaRZmuEErFa57ljpFpkMlkQFSTIjrf5oQKkiC7nU5d A21xRj3uKL7Q8NkItTUOYo+kvFwYgcYG6wCVn08yTN3s+oGcvjobUKKrEnvYfhv9yECj n94MMF3fFjpkMM/N+3PpsXPuixZqt4xrqdDrbjPGbBh6UZznmW7GymcJrYB6lPofkUbm iRz20k96zm7TwmWITqvcli1PWiOo20cwsynh0Oh2WIExl7d6yXwFwGGA3xgj9ekT6Nhu m9kvYAdjHBXaFjbFZypHbLTggcAXyRvlmtrPKxRA//6rDqGdJR+eFAd3JjgBq0EkXHOY xaqg== X-Forwarded-Encrypted: i=1; AJvYcCUgiAZlT4txrLsep8Ee7C1JmNNjfQlyV3MbN+gowceiWvVK4hEvLtRHMLZc7KzQ7b/sEYFO19gkRyXoULQ=@vger.kernel.org X-Gm-Message-State: AOJu0YzmNDBLZekPz2wGGK1iF4OELiqZj7zpCWCYqQVTrsKEmf8caFA5 Q2wpH/qDjaZVTqb8kY9uQ4NLD2gqyLLJq1CCYr12TRoFS9eF9U6nYYsEnLiwxA== X-Gm-Gg: AY/fxX6uFrIf87iIeoKJP/ab9auG+GZYPlLpS9+CmP/q9Gsk4BxI3qH3cx551zcOyMF 6JqdjH330Q5MPO6tboXpv+LV71JsykrBV8cIDQvRpx6EFmt3zD0kn8Ks6jLe8lZxgrGKi5aMW+4 X2NDPT3JHzICV6cwZiKJpAg6vMxuQi2w02xopuZy3t7G1QphdPTdOFF7v/2bZGq5P4n36rNgNIH k1KjgR3uEMcWSeDaudbdB52+7W5fhH5LQrkR4DUTVGdxehz/sqtZVoHW5fakWQpMXLejlK+DYwQ SUc9MPvwlh/GNTT7Q55ugwehOSil5oTd/Arv9c8HDeETDrz6H7ZuVsTibFmcq3kczO0hJiMVQKb V+mBnXoZSxxDY4++/Pr4c3nlAFaOyX3lyuzyHQvLHChrQE4kzgFL4PkWr9RaOsjjo6DXpAmUrj1 BsvQ== X-Received: by 2002:a05:6808:179d:b0:44d:aa8b:58f2 with SMTP id 5614622812f47-45c71463914mr4281989b6e.9.1768487896997; Thu, 15 Jan 2026 06:38:16 -0800 (PST) Received: from localhost ([2a03:2880:10ff:70::]) by smtp.gmail.com with ESMTPSA id 5614622812f47-45a5e17cd0esm12818955b6e.3.2026.01.15.06.38.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Jan 2026 06:38:16 -0800 (PST) From: Breno Leitao Date: Thu, 15 Jan 2026 06:37:51 -0800 Subject: [PATCH net-next 4/9] net: ena: 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: quoted-printable Message-Id: <20260115-grxring_big_v2-v1-4-b3e1b58bced5@debian.org> References: <20260115-grxring_big_v2-v1-0-b3e1b58bced5@debian.org> In-Reply-To: <20260115-grxring_big_v2-v1-0-b3e1b58bced5@debian.org> To: Ajit Khaparde , Sriharsha Basavapatna , Somnath Kotur , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Felix Fietkau , Sean Wang , Lorenzo Bianconi , Matthias Brugger , AngeloGioacchino Del Regno , Shay Agroskin , Arthur Kiyanovski , David Arinzon , Saeed Bishara , Bryan Whitehead , UNGLinuxDriver@microchip.com, Shyam Sundar S K , Raju Rangoju , Potnuri Bharat Teja , Nicolas Ferre , Claudiu Beznea , Jiawen Wu , Mengyuan Lou Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, Breno Leitao X-Mailer: b4 0.15-dev-47773 X-Developer-Signature: v=1; a=openpgp-sha256; l=1976; i=leitao@debian.org; h=from:subject:message-id; bh=OhOSJKzo23oetHtU1SAjOSl7/D+75LUpKZ4+ls31geY=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBpaPvRzU90PVMm7MPekl/O3zK7Y+8MrR9aM6Y7x 4TXeGAZZvqJAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCaWj70QAKCRA1o5Of/Hh3 bZVWD/9LbkqPQzVHwsSImpym9sTbJKoCskNG24AAU/IMLX779t9vMoqcv3HUHYI9fPsDoClHSFW ZYig157cl0LxDp8/sQMiNzWfVOqbu9DgkWg+IWhOcuyqGzB1F7aA0bAr3JS+reJxTm315r7l59y /vq+dBalf5swD1/jXnIjx6Ch8j0syo6aKxPV+8cCh62nQCdY9Zl9lowhAwhx/ofqUfIUM5v8Zsu xQ/TFsQV1f3VIFsZQnJaYHLj8B3CBjTxiO7D6QrvfcoBtpiDLTjV2z5qTD9I/vT76nuCRxsYMY9 2VzsdpmKATfHo/26UJapwSiyM78vm3MBq9fd/vYEFWVGibmQ32ItSkThxx1MvUsK6pVFSbzuhg9 JRuwcONTNvUzjDgI/uRe+0xDwSsvoDbmbQxkHlMDCcdSKDjpLLUyCM3CvpOXHB2jBORMqqS68Ap rIVwinqC+xedm/nDu7gX+ZmRf02xHlkUP0QDd/VhoLO4CL0gTp86/yl7cOIFz2z3DK6DcOwrb0I VYLloSJE6c/w4df5F5Kn1UAafUylUoCr0bhzXu9+xDC4YhUQwKL/G2p2a5zG738+SW8X8Mkkn6t ocFT0jZUdz2/fYxEXl+Cf+Z4xwPv+/JMPOHJaUjuJqNEDfiRCBoQGOnuxMiOaN1MLP8ekZ51eBs WW48ZocfUwPrT6A== 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(). Since ETHTOOL_GRXRINGS was the only useful command handled by ena_get_rxnfc(), remove the function entirely. Signed-off-by: Breno Leitao Reviewed-by: Arthur Kiyanovski --- drivers/net/ethernet/amazon/ena/ena_ethtool.c | 22 +++------------------- 1 file changed, 3 insertions(+), 19 deletions(-) diff --git a/drivers/net/ethernet/amazon/ena/ena_ethtool.c b/drivers/net/et= hernet/amazon/ena/ena_ethtool.c index fe3479b84a1f..2455d6dddc26 100644 --- a/drivers/net/ethernet/amazon/ena/ena_ethtool.c +++ b/drivers/net/ethernet/amazon/ena/ena_ethtool.c @@ -835,27 +835,11 @@ static int ena_set_rxfh_fields(struct net_device *net= dev, return ena_com_fill_hash_ctrl(ena_dev, proto, hash_fields); } =20 -static int ena_get_rxnfc(struct net_device *netdev, struct ethtool_rxnfc *= info, - u32 *rules) +static u32 ena_get_rx_ring_count(struct net_device *netdev) { struct ena_adapter *adapter =3D netdev_priv(netdev); - int rc =3D 0; =20 - switch (info->cmd) { - case ETHTOOL_GRXRINGS: - info->data =3D adapter->num_io_queues; - rc =3D 0; - break; - case ETHTOOL_GRXCLSRLCNT: - case ETHTOOL_GRXCLSRULE: - case ETHTOOL_GRXCLSRLALL: - default: - netif_err(adapter, drv, netdev, - "Command parameter %d is not supported\n", info->cmd); - rc =3D -EOPNOTSUPP; - } - - return rc; + return adapter->num_io_queues; } =20 static u32 ena_get_rxfh_indir_size(struct net_device *netdev) @@ -1096,7 +1080,7 @@ static const struct ethtool_ops ena_ethtool_ops =3D { .get_sset_count =3D ena_get_sset_count, .get_strings =3D ena_get_ethtool_strings, .get_ethtool_stats =3D ena_get_ethtool_stats, - .get_rxnfc =3D ena_get_rxnfc, + .get_rx_ring_count =3D ena_get_rx_ring_count, .get_rxfh_indir_size =3D ena_get_rxfh_indir_size, .get_rxfh_key_size =3D ena_get_rxfh_key_size, .get_rxfh =3D ena_get_rxfh, --=20 2.47.3 From nobody Mon Feb 9 06:27:55 2026 Received: from mail-oa1-f42.google.com (mail-oa1-f42.google.com [209.85.160.42]) (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 0DB453A4F34 for ; Thu, 15 Jan 2026 14:38:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768487905; cv=none; b=OtqXQY/2kMj5rDq3+KqJ1nduDn/ouu00KcGaZLcDAJKYlNVg0azMwZgBqZdMpN/GZmNOpoVvVgL3JUSp4PJMaDem2Kubv+30kemCL0TVNph07jUPOR+TvwgPnXdMizojIv+TY6EluP3qU3t7DAeZBLdXu+5CBNZmqYJj8Wep31o= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768487905; c=relaxed/simple; bh=ZmkU1zoakMVbweOFvSLi3xSqjtnIUISr6NFIqxyt0qw=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Iavw8trjkRQzkGRXHm83vxiMm04JwsTOSN1DHQgj/Ouwiye8EqzpwkxpiRGgunQeecp7N2L8GHC4MIfblXPL325lJAgjyrcQfrqKDR5OfAgjNFgP5YmIt+MVdLK0eJle1XIDhiHhOMbPvF2oI7+XffB6W69WRqM+zOCuQs3zYHk= 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.160.42 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-oa1-f42.google.com with SMTP id 586e51a60fabf-4043bcd09f2so352415fac.3 for ; Thu, 15 Jan 2026 06:38:22 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768487899; x=1769092699; 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=PTVF6JzvrMmVirS5IvqK1B086oNYhsYDQqMiO8SDgo0=; b=b/nd9ZVOrd0kc6Q6R/xQqhlXCKpjPis9g1UInhEFJggSzLMpglc6RpEauRS3VixSRu avQp6479K4Hh40AOalDmJA4ePvuVyrCXvdgyTf9wg3RHYFRmOocwYWgIKXOLQDfP/rS+ SeqwZ09NKlpyrqrNrcUnoqYUwaGLS+Bq5CWtGtGK1NLUBvYXRZ9QzvePuPO72+bWlTBe J2p9IylVw3OD9m7qZjGlnjCJ0Dif8txgBY69Bbf/QQT/zTX+q12STRICQAVo49fHZ7L0 j2xXNYmROpbEl3JrqM27xe9PZi+Ywk0gBFmZ3sKueO9DNwy5h5F3JgMFdH1+wIi1iE03 MURA== X-Forwarded-Encrypted: i=1; AJvYcCUwjd7lRBblg0nwxt4b5tSOC0kyvqZjqrzW9L/ZQZSJuY04KQphA/cL0G2RnK2JYtVZ+ebfZgJMzSKNEFY=@vger.kernel.org X-Gm-Message-State: AOJu0YwYAGvW5ZIJYVGfL4kI0rrg+JDbI5FkqA0vPb2Lcwlhpj61Oh6M A0DASIzRrFJ98XwZRW+U2cKRAztjE5H9z+RGkYwaUteZ1ZSq+h/MQgUQ X-Gm-Gg: AY/fxX6fwhvXxz1WReF07GjgeE263LbkJv0KzCD4WhIcIKWYrbtraQDRSJIuU+OsPOt mkNRooFxiStabnIdPxzpnp0WkOz/5QlNZ5Ga4uteE5KfBUkTSE8W3z8sXVC3v2JrPQZAFI9anNV xmgCcM8r064JvthloQJEci+nm7HXnhVICjEVJqtIKiuGk+5O/obtnV0TEoVuVtw45Uzp8BjFeYO GmVsVlKrF3TuC6wyUUv8NzIcm6Cj/fcHFMSBTZvfI1vR939jDU/3l2PR5Hn2+EDavDW3ZcHWgKy GVVsv8rYDlnUAf27Q9lRLfQEwuItd9hqLT2De8/H70RgUA8u29FqFeSyZY2q471Qf/2e5CoeclC mWwWWV/t92YgwI6/F0AacEdtzxmCrtlIG0WhJy/BrSUokJgkVnmvxM3S9WHcFa5B9hrV/Gs/k2v WN X-Received: by 2002:a05:6870:b0e7:b0:3ec:60f1:c7ff with SMTP id 586e51a60fabf-40406f4cfbdmr4508780fac.11.1768487898129; Thu, 15 Jan 2026 06:38:18 -0800 (PST) Received: from localhost ([2a03:2880:10ff:1::]) by smtp.gmail.com with ESMTPSA id 586e51a60fabf-4040997ffacsm3714996fac.6.2026.01.15.06.38.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Jan 2026 06:38:17 -0800 (PST) From: Breno Leitao Date: Thu, 15 Jan 2026 06:37:52 -0800 Subject: [PATCH net-next 5/9] net: lan743x: 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: quoted-printable Message-Id: <20260115-grxring_big_v2-v1-5-b3e1b58bced5@debian.org> References: <20260115-grxring_big_v2-v1-0-b3e1b58bced5@debian.org> In-Reply-To: <20260115-grxring_big_v2-v1-0-b3e1b58bced5@debian.org> To: Ajit Khaparde , Sriharsha Basavapatna , Somnath Kotur , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Felix Fietkau , Sean Wang , Lorenzo Bianconi , Matthias Brugger , AngeloGioacchino Del Regno , Shay Agroskin , Arthur Kiyanovski , David Arinzon , Saeed Bishara , Bryan Whitehead , UNGLinuxDriver@microchip.com, Shyam Sundar S K , Raju Rangoju , Potnuri Bharat Teja , Nicolas Ferre , Claudiu Beznea , Jiawen Wu , Mengyuan Lou Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, Breno Leitao X-Mailer: b4 0.15-dev-47773 X-Developer-Signature: v=1; a=openpgp-sha256; l=1782; i=leitao@debian.org; h=from:subject:message-id; bh=ZmkU1zoakMVbweOFvSLi3xSqjtnIUISr6NFIqxyt0qw=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBpaPvSiriTlKIUDSeJf3lyJx9g6J6MwyhEctVFY ba4DAlbwuKJAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCaWj70gAKCRA1o5Of/Hh3 bYGCEACmHWrdtJTxtxtEmPPsX2CeZeEu2PQnQ02h7u0Ib3t+jiBGMhQ+DE00fb6SaZ/NvhGaoVx JuAR4M1YkjB+Tk0v4vwjG6Oy2wV5kKYKEQYeyfQ/83Z/3IUdh7ZQZwxthVp2CXkXjyHrphQBMYL GG8JrctzvRlB+2D9g0j+zyj/GMqO9VJZTNH96L10ou/rLQ4+9T/BEPmRcb2qGqpEx60l5Ktx247 ETGowL7+DQaU8c3gDAlxynxQjMnbUSekFRULTh18op7QHoYiNQRtobXYZ1KtkldyJ7De90NKkMn yWURpk8doDCRoFPxQjMdnlkRdaneJUYsxm04loj3GsZ0eImOy8rCPn4cgGGNNWa0RuXSk5X6dSL a+VQ2/vVYkEpT9AGUZtRZ4q+lockReA8gyKfK6sFn3vrq7nG3iXLfssxZZBbl20XzFqYcl3PQW4 NblPb965fHv3x28BoERrvWIHuTWiVEgu+UBH1HxS8Rba4VjCDRq5oHPVpntdEtHFoAmL+BcvQsf pzwwKNVkx5oXzjVs8kQFZwYqf6Up7r9X813J4StIvuBTJ824A6Uua93RU7bGZbR22GWJOY92OIQ UeEkI8QYoBKvYD1472AUPavTrJvrRX9iye7NceceDRk6067lh3ReIEDlfgeFThiSz/Q6W+oFkFf 9hMtYgoMGDE86pw== 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(). Since ETHTOOL_GRXRINGS was the only command handled by lan743x_ethtool_get_rxnfc(), remove the function entirely. Signed-off-by: Breno Leitao --- drivers/net/ethernet/microchip/lan743x_ethtool.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/drivers/net/ethernet/microchip/lan743x_ethtool.c b/drivers/net= /ethernet/microchip/lan743x_ethtool.c index 40002d9fe274..8a3c1ecc7866 100644 --- a/drivers/net/ethernet/microchip/lan743x_ethtool.c +++ b/drivers/net/ethernet/microchip/lan743x_ethtool.c @@ -931,16 +931,9 @@ static int lan743x_ethtool_get_rxfh_fields(struct net_= device *netdev, return 0; } =20 -static int lan743x_ethtool_get_rxnfc(struct net_device *netdev, - struct ethtool_rxnfc *rxnfc, - u32 *rule_locs) +static u32 lan743x_ethtool_get_rx_ring_count(struct net_device *netdev) { - switch (rxnfc->cmd) { - case ETHTOOL_GRXRINGS: - rxnfc->data =3D LAN743X_USED_RX_CHANNELS; - return 0; - } - return -EOPNOTSUPP; + return LAN743X_USED_RX_CHANNELS; } =20 static u32 lan743x_ethtool_get_rxfh_key_size(struct net_device *netdev) @@ -1369,7 +1362,7 @@ const struct ethtool_ops lan743x_ethtool_ops =3D { .get_priv_flags =3D lan743x_ethtool_get_priv_flags, .set_priv_flags =3D lan743x_ethtool_set_priv_flags, .get_sset_count =3D lan743x_ethtool_get_sset_count, - .get_rxnfc =3D lan743x_ethtool_get_rxnfc, + .get_rx_ring_count =3D lan743x_ethtool_get_rx_ring_count, .get_rxfh_key_size =3D lan743x_ethtool_get_rxfh_key_size, .get_rxfh_indir_size =3D lan743x_ethtool_get_rxfh_indir_size, .get_rxfh =3D lan743x_ethtool_get_rxfh, --=20 2.47.3 From nobody Mon Feb 9 06:27:55 2026 Received: from mail-ot1-f50.google.com (mail-ot1-f50.google.com [209.85.210.50]) (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 0DA823806C9 for ; Thu, 15 Jan 2026 14:38:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768487908; cv=none; b=gKv4Y9Q28AvCk5fuRX73EZjk0fJUgt8FCX2gMb10AlTrzMQT5juCgkwZZCyJImh6i0elZLR0ZVEKZG6hmo0CY4WMU4XdZoeqtQacGc99VFs3bm8f2DgLN/PNKtF0caj6I+OZzhVbWvaHG1Q7pqjBA3cAYAp5AmmijPigV+vM5GQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768487908; c=relaxed/simple; bh=ODthTtJ6u9CDqhtIsZr1IcNyVtvAQXiNPRpZYOcZgN0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=uZ4zDSGlRqJI5LC90z7uf02jXIWfrZKkmn2nyXh4lmUh+zx8Z9ZVIZwS64GznXfl/NdoBv9D003hqf2pQ9d7xByv/acmhR5tdGzBIWn/miLAPtSoZ+XaG44x+1LZNdHdfyrJRAZgAmNDpidleJWIKTRXkAD3yCphNDYQQ1R2Ntk= 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.50 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-f50.google.com with SMTP id 46e09a7af769-7cfd0f349c4so628382a34.1 for ; Thu, 15 Jan 2026 06:38:22 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768487899; x=1769092699; 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=Y5CcBKd+oHd389nAO0f8lXHf2tMCfoqnx1fCEDJhaMY=; b=ipHXUL8gm4dRh2zba98kushdhSvRW0fRVRg9k4PvXqlxM3mH1dt+VPfWSn6vyjkv/V mCRkzqndRAyV29q0BStwmPB8C14iwmfn8qajC7OU2fkywAiEmOJYSFqn3nScc+BUACQr rQoJoD6Tm2qSWSJp6NEtDhJFf+5CDGK96B+64MGT7ZTLpBhOjJGdnPcajuUIuhXWDmkx b6N+xQf/eF3EbFXrJwGXP6znTRuQHqR+Wh1F34pZRI/dY6aogjh5hogcMR/yOLOV0Ino unquhnZmKB7VpBzlGekqm6AAalIXUhIawmDQliTqOsaxHRLawn945FPXzba9RAZcHPNi nWJA== X-Forwarded-Encrypted: i=1; AJvYcCW0ezo2X5yQDmqEISp/JEDvh903iR/2X43rjvEvI3FhAlT6DOcyYWilokIEgSREEw4SruXVGbIzNQZ26IU=@vger.kernel.org X-Gm-Message-State: AOJu0Yy7vVUNjcxeeMO35b0okhXt2b8flktgvPgU+tpqOKC/4yH+je8q aOxYGqNGvab+OboLT9G4+iNErEakQ8/EwObYuN/q4wJ7ugfvHPZ3khqP X-Gm-Gg: AY/fxX4CG+C2Vicuhe38e1IkNSjzDuqbT6yhsjW7R0wWNjxPKkO9Pt33EpKlrfKmezR JX5wZzzS0TYCXYtD5g/P05odwcuClxWpqjEFXj65lL5h9QiMpNJIb23OgVqjnPMSLrzHRCPNYdy Hi/49A3dk7pPqHHlZiiv14wm1AcMOe5Zi5NydcdEd2g0isUqg0MndYQ29+9FbHvuiiVVnxDvSOm 1S11rBWLBAePGi98PvezwisRcdXl9Jc71A5S1l5dslrtovEg1/7tIwO9YCY6mitzeXSDUJdSO8B E3Mun79tFP0n5P4LvHy3ZmEYcxGYAUclBT2T3G3ZCWIYL5jD/g0DbwsPdXvHQgWBkzLwi+njhBy mkHzZXPm0cRxXwK4pMe7l4bJWD6GCKTxRE7pZzzz9Eq8IURczcu3cXxdRtIWDhrqUX1XGg3bBCQ u7MMM+XN+x3ejF X-Received: by 2002:a05:6830:3143:b0:7c7:59a1:48d7 with SMTP id 46e09a7af769-7cfc8a7b0a9mr5415119a34.2.1768487899275; Thu, 15 Jan 2026 06:38:19 -0800 (PST) Received: from localhost ([2a03:2880:10ff:49::]) by smtp.gmail.com with ESMTPSA id 46e09a7af769-7cfcc8428fesm3470134a34.0.2026.01.15.06.38.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Jan 2026 06:38:18 -0800 (PST) From: Breno Leitao Date: Thu, 15 Jan 2026 06:37:53 -0800 Subject: [PATCH net-next 6/9] net: xgbe: 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: quoted-printable Message-Id: <20260115-grxring_big_v2-v1-6-b3e1b58bced5@debian.org> References: <20260115-grxring_big_v2-v1-0-b3e1b58bced5@debian.org> In-Reply-To: <20260115-grxring_big_v2-v1-0-b3e1b58bced5@debian.org> To: Ajit Khaparde , Sriharsha Basavapatna , Somnath Kotur , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Felix Fietkau , Sean Wang , Lorenzo Bianconi , Matthias Brugger , AngeloGioacchino Del Regno , Shay Agroskin , Arthur Kiyanovski , David Arinzon , Saeed Bishara , Bryan Whitehead , UNGLinuxDriver@microchip.com, Shyam Sundar S K , Raju Rangoju , Potnuri Bharat Teja , Nicolas Ferre , Claudiu Beznea , Jiawen Wu , Mengyuan Lou Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, Breno Leitao X-Mailer: b4 0.15-dev-47773 X-Developer-Signature: v=1; a=openpgp-sha256; l=1681; i=leitao@debian.org; h=from:subject:message-id; bh=ODthTtJ6u9CDqhtIsZr1IcNyVtvAQXiNPRpZYOcZgN0=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBpaPvSl1WBMCgycevY3sZ6KOF/eZNfSYtIvURYg xosFId6dAeJAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCaWj70gAKCRA1o5Of/Hh3 bWs4EACw6OGGyvcIE93XAIfzg2CzJAI+6roCgCWsaka2YS45lxnXlbwqOUaG7IadxMkwZrlSPq5 rZMbwhDnOfMfUj43ZHlAygHa22r3zGiNJlcc/aM58ao5yPNWj1t1K3snMLIrQu6vTnyposuMiyK cMSUnGE/YP5/Ak0GbPeDfxXvqDtkYKr7SIqHmTAXkJe14K9/ZVTQ4CViC1u+Rn3t1vu7R5kkyoD 7tKutYVDqZvnFs0nrlVfuyCbGFwHGXyAtvLpzLk+7UBDFdlc47m8SoutLl48uKJFkpS5rzU3rIz 7IRKwmOLyfc3OVyHMXRdlnRwJF1/LQmobFacLu6Y6cXjp5N0jvWZk+LtjfZhNeE0DNuzzs0KkDh npJBQfK61w/DNZVFKXuYvYHnlaBS2m9IrR9xhsZLqci5CAieOtQP+fmtMaKrnxeHeLJHIBov/0x Lo5Yy830q1kUDPSN8/ACV3Xdi4dP0KYZvupaEd2V6B0t1xsuq6tLh6kxKAchFRzGGTMGvXPGm22 UNf3YWv7yGO07RsSahj8ov6UiDOx1GXjeb3JTFcKqU9DDVftbu45pCJ0dyj2kFn2QlH9yrBFjum 6meVsAd5N2aKR20VPTfOLRMH0sIxloQw+e0LS17La28WyUdk54LQ0o4UvboqD5gO7RWEQW4Qf4n TRZv1QA516MJtEA== 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(). Since ETHTOOL_GRXRINGS was the only command handled by xgbe_get_rxnfc(), remove the function entirely. Signed-off-by: Breno Leitao Reviewed-by: Raju Rangoju --- drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c b/drivers/net/eth= ernet/amd/xgbe/xgbe-ethtool.c index 0d19b09497a0..8ebf0de7a01b 100644 --- a/drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c +++ b/drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c @@ -414,20 +414,11 @@ static int xgbe_set_coalesce(struct net_device *netde= v, return 0; } =20 -static int xgbe_get_rxnfc(struct net_device *netdev, - struct ethtool_rxnfc *rxnfc, u32 *rule_locs) +static u32 xgbe_get_rx_ring_count(struct net_device *netdev) { struct xgbe_prv_data *pdata =3D netdev_priv(netdev); =20 - switch (rxnfc->cmd) { - case ETHTOOL_GRXRINGS: - rxnfc->data =3D pdata->rx_ring_count; - break; - default: - return -EOPNOTSUPP; - } - - return 0; + return pdata->rx_ring_count; } =20 static u32 xgbe_get_rxfh_key_size(struct net_device *netdev) @@ -752,7 +743,7 @@ static const struct ethtool_ops xgbe_ethtool_ops =3D { .get_strings =3D xgbe_get_strings, .get_ethtool_stats =3D xgbe_get_ethtool_stats, .get_sset_count =3D xgbe_get_sset_count, - .get_rxnfc =3D xgbe_get_rxnfc, + .get_rx_ring_count =3D xgbe_get_rx_ring_count, .get_rxfh_key_size =3D xgbe_get_rxfh_key_size, .get_rxfh_indir_size =3D xgbe_get_rxfh_indir_size, .get_rxfh =3D xgbe_get_rxfh, --=20 2.47.3 From nobody Mon Feb 9 06:27:55 2026 Received: from mail-ot1-f50.google.com (mail-ot1-f50.google.com [209.85.210.50]) (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 92A0C3A4F33 for ; Thu, 15 Jan 2026 14:38:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768487909; cv=none; b=jw3qeoMOda+hHjPR064XnqicHrUPcQEwzwJ3pkO1XkGnxRqG4FcIZUKmPyFJFuC314+Bsibdty/SmNYyJ3EIhcAZKKHTdMkW758p+37EdMN/7P0/XX3Sw9dbSQKqsgbE6oJHdWwU7Nc4/m4rFRjAABpI9tm/Cw7g516WhjFO1zs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768487909; c=relaxed/simple; bh=mTt9g4AIDDCE/wyHFNRn7ITIDqk1FNXdFvVq0NDOWRs=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=o/srZ2STBWSfS0+hi+q+Cb98S3yac5ZorLVNi+VEPyOUaxnFkNyYpsKaYYNI6y6LgRklOFTN3nOghNGMJhbVGzBD6WQ7AvKrfPWOVkcREU3RSbZ/vMhVnBay4Wubg4FLPcmYWf3GyfieZeila3vcQsKP/5Jo4I9MDeDNhvg6puA= 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.50 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-f50.google.com with SMTP id 46e09a7af769-7c76f65feb5so783005a34.0 for ; Thu, 15 Jan 2026 06:38:22 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768487900; x=1769092700; 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=otSP3WumEJ9ljtBMFrQYAuqQcsR+pe8+cqNgEJVYYfU=; b=DQN1HJLU/3I8+x1pUrPssaA4OXnC2aYqm/CbYrW2itbFvhJrZEpUqJo6fL/ns3De2l d9f3tb9fc3Hd5Mr6fjVPfAnCWRhN/e6OBJ0ks5CB+uKyhgs3wD9gqR1KICbBehgtZU2u jQt6vdRkgB3fAvSylGSFixK0JR9b3EEw8lARkzhRSjtNyS5G6VDsrTctXw8jYTejzG0k YC6l+qDiqSKST8WF5zl7BwNbPaEXKz4wc8PE7HMkKaFV2QaiC0AjWVuSVebaqg6ixD65 DWqTK+ZLAIQbMWY0j4piFTBKw4P/LHjcFKlHHZhxfGoEJk9viaAdvDQRoGetTH2GbZLj mqpg== X-Forwarded-Encrypted: i=1; AJvYcCXSIGqK23KgQgoqgsG1XCww32rKojkF4vnSYR0guYH3t8njhZCmR1I/0BponmNw88RQ7e2uD6vewEj7njE=@vger.kernel.org X-Gm-Message-State: AOJu0YzANJHkj/DrYmzFxwG7y8+gmm4gEAzIlJDiEE40RW5Mf/341Pw+ /2pKMn3VDNXgLnkOJm2JP8GwTfD1bo1ZmCAcXaGaDzZPk7BNuJZ5bkKD X-Gm-Gg: AY/fxX7VZKAhu8LYUX3uydq0u18IOsYDhcNVD8OSC6GNv0kfgApzwapt2MnsYvEhNNL dossOJD1OAsJXckSdKwGr2t2MsZSOHnhcN8ZOuc20Oe/n2NJAIIWXVYVwpiVGP+Mzy7tHaVAN9z FWVXu93ssiRwFYxXoq2wGlyGNDpnhDa7q8O3FbMNSFFKDrcxiS8Xi58hSs1jRAUN85/sb9f8cNu PGMyhU/GrfB828fXq5+yTaQaKH8W/Jc2fOpAWsnKmiYFo2loYKdviiKqyrAjjwKt/I13AgZfwGG UDXjXcG5culpjpkyFt+Fh1PHYzskxOro2hY1QUFMiGubToEd9nT9rl4BA/flFgkwWeKfFPnUrX5 d9ErkDjLxQe5SQpbQgy3F50kPSzZtKNMbN5eUUYH4wLC/LnOY7O6+iY7XI5gA8kY0RJ0L3FmePP QaMQ== X-Received: by 2002:a05:6830:358e:b0:7cf:da97:57d5 with SMTP id 46e09a7af769-7cfda9757ecmr957520a34.34.1768487900523; Thu, 15 Jan 2026 06:38:20 -0800 (PST) Received: from localhost ([2a03:2880:10ff:55::]) by smtp.gmail.com with ESMTPSA id 46e09a7af769-7cfd68b13fesm1559488a34.3.2026.01.15.06.38.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Jan 2026 06:38:20 -0800 (PST) From: Breno Leitao Date: Thu, 15 Jan 2026 06:37:54 -0800 Subject: [PATCH net-next 7/9] net: cxgb4: 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: quoted-printable Message-Id: <20260115-grxring_big_v2-v1-7-b3e1b58bced5@debian.org> References: <20260115-grxring_big_v2-v1-0-b3e1b58bced5@debian.org> In-Reply-To: <20260115-grxring_big_v2-v1-0-b3e1b58bced5@debian.org> To: Ajit Khaparde , Sriharsha Basavapatna , Somnath Kotur , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Felix Fietkau , Sean Wang , Lorenzo Bianconi , Matthias Brugger , AngeloGioacchino Del Regno , Shay Agroskin , Arthur Kiyanovski , David Arinzon , Saeed Bishara , Bryan Whitehead , UNGLinuxDriver@microchip.com, Shyam Sundar S K , Raju Rangoju , Potnuri Bharat Teja , Nicolas Ferre , Claudiu Beznea , Jiawen Wu , Mengyuan Lou Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, Breno Leitao X-Mailer: b4 0.15-dev-47773 X-Developer-Signature: v=1; a=openpgp-sha256; l=1593; i=leitao@debian.org; h=from:subject:message-id; bh=mTt9g4AIDDCE/wyHFNRn7ITIDqk1FNXdFvVq0NDOWRs=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBpaPvSKI56w6S51MA1g4GESPyU+3R/PgLYWFpyg RPCz4ftjtyJAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCaWj70gAKCRA1o5Of/Hh3 bT6nEACvWlpHECCXJWCsSIz2b2fYD3jmE+YC812EOVG5+Zgom6pRSjYRnpNtdw6aB4pt4AqHazt HZFziZXiPwrVJ2KHKtvLJZoxKPasMBVoOXL66e2D5tK5/mI0KYr9tm7YPRiMH5dGlcGJKU6XNsA G6N+dTc7KGSezfQbek6Bd8dWIpoxHoewdIhlkQFtiQ/X0GnV8CP+YBxfN8e7VxS6ORKI9Eu2w1E KRO2JjSj1cz2bfntjyD/I3tzznYWFgp1+ghvduFHDLRfEOFyjxdMyJ9/2hwXO/SiLOUDqhFIK2I xHata1GinUobVH5wC/JDB4I24G7sUoqrW1vUQVFScu8p+i90ajthRDbJFsAIEJ3AdeAWWu3VKMI 57ArKtwl6Qv6V7N6KfHRPi8sFD6PdAv2wVDq4w/LJbAzSfug48nxIM664m9EihWEaVEvEZLpiDZ A/ODC9UEICyZdjzs/yEz6P3R3/Oyjrh5u0HffU7u8PEUU48MpBTkw/WaTy+sTzjhAAm3+DYsLGT YxghWqGbpydPH6FaGSUgKB8ISAEFYnUsA3Zy0MBeZ4UbwKOTxFAIC3JhDyrH2GLh70WwgTyGEjC ZMISm3UWHjF23jaIfJBhLLEk7ANEUDZd0JZ3YumtwhGKWR0ZvjOj/uQRxh1k5rkMRlHSNhqRCZv YJxvQ2AHmSnZF5g== 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/chelsio/cxgb4/cxgb4_ethtool.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c b/drivers/n= et/ethernet/chelsio/cxgb4/cxgb4_ethtool.c index 23326235d4ab..faf8f7e86520 100644 --- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c +++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c @@ -1784,6 +1784,13 @@ static int cxgb4_get_rxfh_fields(struct net_device *= dev, return 0; } =20 +static u32 get_rx_ring_count(struct net_device *dev) +{ + const struct port_info *pi =3D netdev_priv(dev); + + return pi->nqsets; +} + static int get_rxnfc(struct net_device *dev, struct ethtool_rxnfc *info, u32 *rules) { @@ -1793,9 +1800,6 @@ static int get_rxnfc(struct net_device *dev, struct e= thtool_rxnfc *info, int ret =3D 0; =20 switch (info->cmd) { - case ETHTOOL_GRXRINGS: - info->data =3D pi->nqsets; - return 0; case ETHTOOL_GRXCLSRLCNT: info->rule_cnt =3D adap->ethtool_filters->port[pi->port_id].in_use; @@ -2200,6 +2204,7 @@ static const struct ethtool_ops cxgb_ethtool_ops =3D { .get_regs =3D get_regs, .get_rxnfc =3D get_rxnfc, .set_rxnfc =3D set_rxnfc, + .get_rx_ring_count =3D get_rx_ring_count, .get_rxfh_indir_size =3D get_rss_table_size, .get_rxfh =3D get_rss_table, .set_rxfh =3D set_rss_table, --=20 2.47.3 From nobody Mon Feb 9 06:27:55 2026 Received: from mail-oa1-f41.google.com (mail-oa1-f41.google.com [209.85.160.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 DBD743A4F4A for ; Thu, 15 Jan 2026 14:38:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768487908; cv=none; b=WLT3IyF6bjFCC7SIrVEOp0HXa7a+JGRhwPxMul6iSLFvXSQAH5xjTUdY+c0Y+X7EuaUUf0YLO+NrtAvgsReCDG3ElSx7QSHfDN+JVlcqvNAt1qx2sRuxoe4tGiR2cj1TvuveUmroGh4+0afQbESMWUCi0mWI5gmldk9curIeKJg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768487908; c=relaxed/simple; bh=EDM5owIVyL2DjajXDu3o5iZ+GCzD1U2tQZv0qOHfOAk=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=W8/gWx3RlymMdP6FGsnw6qH8rGMwIqT/UsEiMDLy/SZcZwDy+TjoPBJhnOFrUQAmB2bXYhdQ8XJtEjOM/VTG6ZmWd3QLQhvsrl2o+/eiyi3qwQ7TlZXL8MU1xS8NR83tJUd/0uHmYpljtPr3VASTH5Xa8wCUoFY6pCiyNDg5P1E= 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.160.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-oa1-f41.google.com with SMTP id 586e51a60fabf-4043bcd09f2so352455fac.3 for ; Thu, 15 Jan 2026 06:38:23 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768487901; x=1769092701; 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=I3QziLtppri025RUH9iC7KG4n81ulsbjnXMb8+qxeEw=; b=kDu3HUih59ctbAMB1VWE17as7Pn1jehDf05XYaOJc7QRA2+C1LY28y0W38JSwTBjvP fwXf5JeokbfYcTDUw91rkD9/rMwQvx+crhS7E4kOFtr5klzdIK9+3yzKCrc1IK7YHLcd 5KleGKPbbiIJVyzLyGhzpbCqAjweM8uhSsqz7sMWPatklMVLlqf+2veZMkuJmXk+f5Bo vIhsO6Yx5TntDNEYar51N4PduPSZvTZZjtxF4uwpKwWxuKyQ6Q2cfTZISl/OaZGBXeSy KrwCl7SZcyQ0SqNbK2orqLrp9E+7C+djYYA3iJre9ArGuAWSJtsnI6CKh7MjgC2o4mEh TOug== X-Forwarded-Encrypted: i=1; AJvYcCXQ667TT5BkLS/is7ZJpg0TsEeK5rtoyg8BW1N4r4hPMT0qo+e/+eHbXTAv8348LRrrOCckUVNYoOs3rSE=@vger.kernel.org X-Gm-Message-State: AOJu0Yw7upHtgxpSI0s9Euo0eWRkQjxncCaNJXxYFfQt1xaseRbL40o2 Rot00FZRBQbEeEJfjNMkWbWxvL0VbUeFCUx7sa+1sJ5tA1v6ODis2Axx X-Gm-Gg: AY/fxX5H+kwcEDsAcEKQ5iWqQnw8CYhd7XgDu4IFgKoOhNJ9bHiMnQKKnaW3qwdjs9X Au2kvuOEK92LluWGq98tS092Gg+dvsNgzGmkCS0d9xeC0PKBes37RE/Pk+NRILV5HhXEQVuhpfR 43YgXb+J2Bw4jaThEk4CH9ut993gT27TwxsjYDo8xB9e9a8vItJAV96RN7WIz/6bIkxtu3iKMCL 4LS7hJWRYhnBeSgfORXB63IHNt9f5jQoICx2SaRLfPMbyHb1yK/9bxwf1WNJF9FEt9TD7sWhcby P+IScT8xk6VRO96O05WxB6mKMBk8TK8KnrTMmAcpuelYlI+WkBYjYNTdxo+4+y4rzXXhcPdXrdy UFumzLOigNFsVappKlEeOVj2yTyfaGErGSVlK5+qL6E5TgNTBBZ0Nzv4k9TT6fTk00UYimXYONV SvFg== X-Received: by 2002:a05:6820:7508:b0:65d:1697:e6ce with SMTP id 006d021491bc7-6610068d279mr3919809eaf.23.1768487901584; Thu, 15 Jan 2026 06:38:21 -0800 (PST) Received: from localhost ([2a03:2880:10ff:74::]) by smtp.gmail.com with ESMTPSA id 586e51a60fabf-404427177f0sm400425fac.9.2026.01.15.06.38.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Jan 2026 06:38:21 -0800 (PST) From: Breno Leitao Date: Thu, 15 Jan 2026 06:37:55 -0800 Subject: [PATCH net-next 8/9] net: macb: 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: quoted-printable Message-Id: <20260115-grxring_big_v2-v1-8-b3e1b58bced5@debian.org> References: <20260115-grxring_big_v2-v1-0-b3e1b58bced5@debian.org> In-Reply-To: <20260115-grxring_big_v2-v1-0-b3e1b58bced5@debian.org> To: Ajit Khaparde , Sriharsha Basavapatna , Somnath Kotur , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Felix Fietkau , Sean Wang , Lorenzo Bianconi , Matthias Brugger , AngeloGioacchino Del Regno , Shay Agroskin , Arthur Kiyanovski , David Arinzon , Saeed Bishara , Bryan Whitehead , UNGLinuxDriver@microchip.com, Shyam Sundar S K , Raju Rangoju , Potnuri Bharat Teja , Nicolas Ferre , Claudiu Beznea , Jiawen Wu , Mengyuan Lou Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, Breno Leitao X-Mailer: b4 0.15-dev-47773 X-Developer-Signature: v=1; a=openpgp-sha256; l=1512; i=leitao@debian.org; h=from:subject:message-id; bh=EDM5owIVyL2DjajXDu3o5iZ+GCzD1U2tQZv0qOHfOAk=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBpaPvSl1e/Mq8M8IDjFCUaBOsQM77krGX3tiyP7 UJQ2NGca2SJAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCaWj70gAKCRA1o5Of/Hh3 bTjfD/wMzBjLyL7mbyJwNKwc6wxg6I5YpP5F0V0MfH3hnmp955ZI8DFLIKq/u+nPJlokYB22aYt 1Bplo+zYTfN+TGaRW6KNauxtNSk3BMTcqkeiTWWZ4SI13BT2RJWkI1x0pNcKsCDTy/jzwKVXUmH pZFIl2VCZP/VGdI90bGpuzJ2NCJX5OznIHaPnZUrsn3NWmViPkOxaKvchYbloRkbSONSAQPT5eH 4XaveFvRvIWR8a6jhKCJwHvJ4z+ovYTCY4nQSEXt9Yb7plU9XNWh3jufYzDXv/gtbHdGhZZDxHJ 2rgPBil9vZwKsxd99nkO3TwH/fQ+btPcSNDi7+bNovV9eGPzEa0GKHYNPIbvxbSppQ57nrQXOCX U8HHIZuBgGueWGZjo67G3GUZ+otCCqpD9X5Zkbiy4dLYoZOjAJdZPoFFvds34Pfoq7hd96IZe7D 5Tn9iZXKP6RzqTskPCc1IwSgqO6hWUnkmrPArVr6yS7mgPf4Ed3TQWv9TjlqWcXN0/Rmvaz16Po uYu+x+fenatWmWeGgp5Vq71IelJuxVfwLYkrWbgF1ltF8+/lc51g/6Kv0WeVl6OXVRixs3En+RP fKnKPBRdciCbDxzoocETR6oC14LkfWfBT2KUEBpglwPpNa45J9T43hsUu2t55DfC44qRxs9/1yJ pIRQaqI/0N1tTeg== 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 Acked-by: Nicolas Ferre --- drivers/net/ethernet/cadence/macb_main.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/etherne= t/cadence/macb_main.c index 2d5f3eb09530..8135c5c2a51a 100644 --- a/drivers/net/ethernet/cadence/macb_main.c +++ b/drivers/net/ethernet/cadence/macb_main.c @@ -3850,6 +3850,13 @@ static int gem_get_all_flow_entries(struct net_devic= e *netdev, return 0; } =20 +static u32 gem_get_rx_ring_count(struct net_device *netdev) +{ + struct macb *bp =3D netdev_priv(netdev); + + return bp->num_queues; +} + static int gem_get_rxnfc(struct net_device *netdev, struct ethtool_rxnfc *= cmd, u32 *rule_locs) { @@ -3857,9 +3864,6 @@ static int gem_get_rxnfc(struct net_device *netdev, s= truct ethtool_rxnfc *cmd, int ret =3D 0; =20 switch (cmd->cmd) { - case ETHTOOL_GRXRINGS: - cmd->data =3D bp->num_queues; - break; case ETHTOOL_GRXCLSRLCNT: cmd->rule_cnt =3D bp->rx_fs_list.count; break; @@ -3941,6 +3945,7 @@ static const struct ethtool_ops gem_ethtool_ops =3D { .set_ringparam =3D macb_set_ringparam, .get_rxnfc =3D gem_get_rxnfc, .set_rxnfc =3D gem_set_rxnfc, + .get_rx_ring_count =3D gem_get_rx_ring_count, }; =20 static int macb_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) --=20 2.47.3 From nobody Mon Feb 9 06:27:55 2026 Received: from mail-oa1-f42.google.com (mail-oa1-f42.google.com [209.85.160.42]) (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 DDDD737F0E5 for ; Thu, 15 Jan 2026 14:38:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768487910; cv=none; b=ajH7qqQrQJQrVCzi2e5EygJirFkC0CrD67g7sCtG+PPzubxCLZStE2jQr+Ccf/U+qCl0XvCK0lVZMd3NhoWMeO+cwdTxdSZ+oaXyu6YKE8cO1kHuBnlTjIaBtzSQKRDt8viVLQzUGc9HJgV2KpjK0QN0CK8PKMl0PBudfUK9x7g= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768487910; c=relaxed/simple; bh=iHjMCRl1osOPGeWzfnK2KNM/9EoiAxwpcSWI+XP02wM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Xg87OWHrtyk6kUSM5XhGzGWMcurbDKQHb6A/1N0uJeN0lDn6e3ZLxklC+y9u4q/2Bj2RYBpTsZtEDrNdyUTl91CmFI/tzrJT2p3Fvh/qq57LMP96N9ezBnsBcpnX1WCvax3+uhh6id1K9FRjm1vAbnBvre8/sH0lawk1RIM7PNg= 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.160.42 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-oa1-f42.google.com with SMTP id 586e51a60fabf-3f5aaa0c8d7so777178fac.3 for ; Thu, 15 Jan 2026 06:38:25 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768487903; x=1769092703; 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=a/GYuhAPyxh2VtKR9ECrwYwGFXjwcnfw71zewQTg4IU=; b=fmYkrx9ugfKX5XBcbkapO5PDIhOIQJcaSo5qaQDVa8JPtaON8/JRI2rIuOtHs3J+SL mJ/43yo6fJyaMfez6bdgrCdxFMZOdT2k2nB2Q6jB4lcZhF6gYOuKWFmJYDH16aW/MsMx qAH71n6DB2qAwA7rjlouMfXsgoe8vmxnJBm5MztPH22RIijxmJHSDC3t7o2kqbOvpp2V sjZKqJiPZLtVA33v2NMISAk+XSgTXmYX6e+4gJLAgb8hThXzzSvHbuO2jxp7L28V1e5B QbTCe+uEdCvgrohKw1U6j+M0Cty8Xm3MNDZ9ZboTWepOR9qb6YweWgmCPtp8DMywc8fE 2WYw== X-Forwarded-Encrypted: i=1; AJvYcCVu+AaojAHjc9T0GdYKg27r39umeNsjTJv9eqQvo0jBoPQuoN73rsMHe3fdq8xuw3ttEc30qElRcaO7mbA=@vger.kernel.org X-Gm-Message-State: AOJu0Yyq5K3tvpccAfThm5BY5JElfe7BmNKx2H3PvA9V95Sdt5ahU3KR vqcVeQJI0K+CWSdYMoaq7FU4+1RV1Cf1K17pV7KURYgAIZIuAiWQLsxS X-Gm-Gg: AY/fxX4i3SDNy+6G7ThxlTT+G2eFD5Qnm7+7cEXipr0g2UVZzlgZvhWLatIsN2Vxgpd nHsiQ3kqBZzEeheQNg03gH8E938aRKiRgFZAY6++a5OgyURH4g/KP8mF+Jx7D4TCLLvKGtHNQM0 CNW/YsUq7SFuKAn1Zr7im7n/VImhMLdF9bSiSd1JpTqI09gMnO8UlbjpA/KnXdy3eKPPmT/p9Vv gCvUF29/cP6GxNkSspb0L3Jnjbk8rG/gey6lItPMzCtt5sWPQ+gzwxJbjp/uS80XjxtIRXW4o8t FJHqVJ9DBu51Ajr9SEnKVbrz6w7EvxR4j0WzAQLC0XKstA0I0hPKmPkStMvqMzcHlLv4Mpvcyb0 3MvNY3AK/K6Bkav/N29K4OyCBbWryb9RAengc/BvjlCfrteH0MtWzgFjzVY8gv2ZOIDOd8q46SI 8K3KDXT+H94ck= X-Received: by 2002:a05:6870:864b:b0:3f6:2118:2d37 with SMTP id 586e51a60fabf-40407155e60mr4009310fac.42.1768487902673; Thu, 15 Jan 2026 06:38:22 -0800 (PST) Received: from localhost ([2a03:2880:10ff:3::]) by smtp.gmail.com with ESMTPSA id 586e51a60fabf-4041a20051csm3187622fac.17.2026.01.15.06.38.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Jan 2026 06:38:22 -0800 (PST) From: Breno Leitao Date: Thu, 15 Jan 2026 06:37:56 -0800 Subject: [PATCH net-next 9/9] net: txgbe: 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: quoted-printable Message-Id: <20260115-grxring_big_v2-v1-9-b3e1b58bced5@debian.org> References: <20260115-grxring_big_v2-v1-0-b3e1b58bced5@debian.org> In-Reply-To: <20260115-grxring_big_v2-v1-0-b3e1b58bced5@debian.org> To: Ajit Khaparde , Sriharsha Basavapatna , Somnath Kotur , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Felix Fietkau , Sean Wang , Lorenzo Bianconi , Matthias Brugger , AngeloGioacchino Del Regno , Shay Agroskin , Arthur Kiyanovski , David Arinzon , Saeed Bishara , Bryan Whitehead , UNGLinuxDriver@microchip.com, Shyam Sundar S K , Raju Rangoju , Potnuri Bharat Teja , Nicolas Ferre , Claudiu Beznea , Jiawen Wu , Mengyuan Lou Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, Breno Leitao X-Mailer: b4 0.15-dev-47773 X-Developer-Signature: v=1; a=openpgp-sha256; l=1635; i=leitao@debian.org; h=from:subject:message-id; bh=iHjMCRl1osOPGeWzfnK2KNM/9EoiAxwpcSWI+XP02wM=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBpaPvS2jwDA4B5OVdm2pYfwE5wwEoA1TjfN+vFk Oq4iqdDPU6JAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCaWj70gAKCRA1o5Of/Hh3 baEtD/0e4jxGdtSnXlNdd3Ym+AmQnqmw+uQARxVH3fvJRkHoecl3Hzt6HnkNMpJ2bHcL+Ykuo+2 bqDVJi17xCAxz/JJ+E5uhNl7rq1nzJiOdALOcbtS+q0vaAqaZANFIQTUTAtwvr8Vcykq8fnNkr0 2xiADYMIU5s+WuQsMpxl097cT8oXChiukHlT6HsJ222668dm5nRiPA0evqv/2pWsVDaAywkAi6x aeiwdgG4iQxbfanDh2VKer1hvyDYRelxSgXXwz9N4xwcSk8Wfz5aDDHNrzSYqDMGdS+E+kjPat0 t4kMwgKvDihLCIWfhFIASs4E9SQRkuqb8Jl9NPamj3g0kSm4VqPztopV3u/iPeb9hidjshOk1GS qxDrEiy97dK97aot5HKc9ujq+XVUI/Q51g0H3img2C95IaK5r7LWia1OALMEcV2cBy/rbsNPfas K0QBWLVLDq2PqiUc25Jxy+TG+ctt4emx4tKPDjc0Pe1pk1H3Tgi06WXLVavvwsW9ksgo8O7Sf6a Db19Wi8PouSxa3fu+u38JygBavrl/AFKs1l0aVN5h73ufNH1bOfS1xHmgvxnchF0HmnRm3G+CHb KvdDaYueCtvOsJYb1eivSnDKOoF+M7LQRcakwSN6tgiUiFJI8r9TH1aKmpkYtvWyA4rRbcHIk/q pdghbi7qVDQhMoQ== 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/wangxun/txgbe/txgbe_ethtool.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/wangxun/txgbe/txgbe_ethtool.c b/drivers/n= et/ethernet/wangxun/txgbe/txgbe_ethtool.c index f3cb00109529..59d758acccf0 100644 --- a/drivers/net/ethernet/wangxun/txgbe/txgbe_ethtool.c +++ b/drivers/net/ethernet/wangxun/txgbe/txgbe_ethtool.c @@ -193,6 +193,13 @@ static int txgbe_get_ethtool_fdir_all(struct txgbe *tx= gbe, return 0; } =20 +static u32 txgbe_get_rx_ring_count(struct net_device *dev) +{ + struct wx *wx =3D netdev_priv(dev); + + return wx->num_rx_queues; +} + static int txgbe_get_rxnfc(struct net_device *dev, struct ethtool_rxnfc *c= md, u32 *rule_locs) { @@ -201,10 +208,6 @@ static int txgbe_get_rxnfc(struct net_device *dev, str= uct ethtool_rxnfc *cmd, int ret =3D -EOPNOTSUPP; =20 switch (cmd->cmd) { - case ETHTOOL_GRXRINGS: - cmd->data =3D wx->num_rx_queues; - ret =3D 0; - break; case ETHTOOL_GRXCLSRLCNT: cmd->rule_cnt =3D txgbe->fdir_filter_count; ret =3D 0; @@ -587,6 +590,7 @@ static const struct ethtool_ops txgbe_ethtool_ops =3D { .set_channels =3D txgbe_set_channels, .get_rxnfc =3D txgbe_get_rxnfc, .set_rxnfc =3D txgbe_set_rxnfc, + .get_rx_ring_count =3D txgbe_get_rx_ring_count, .get_rxfh_fields =3D wx_get_rxfh_fields, .set_rxfh_fields =3D wx_set_rxfh_fields, .get_rxfh_indir_size =3D wx_rss_indir_size, --=20 2.47.3