From nobody Wed Feb 11 02:54:37 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