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 5689F3EFD05 for ; Wed, 21 Jan 2026 15:56:26 +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=1769010988; cv=none; b=jZEh6Lpz0Z3Eksngk9zIQdU1yjrb7+KMzHnyPl19+Xp52/dezRHirxQEmcuPnwyk6lemmyisioOL/UOHofW2UR4526to/gxaAw2sAMNb2Lj2t/DmgPh2VUPSWJCyBoktuoJu9Du7JRNmmhuDwAjtZjBXme5jd990+hThFgZ/w8g= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769010988; c=relaxed/simple; bh=IMKgxRU1sol0qv3q4ykIX98inRbeR6UTILUypHJQ1KU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=gCVvJJcOqKdlG8B+MhcHwqi1DPAc8M0kNNMkdHf/2+jky9M2nqNGR14iKpA54NsfED0CN2jwUK3M8V0MjISaIsl3snirbCvjRS5EotfXYUKnNqbPy2A90Ky98FlVa+OFVXWgTAbpjsbkux0G0RzqzBKfb3O6LG6eoIT/4Xc7+YE= 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-45c9f47e1e8so14566b6e.0 for ; Wed, 21 Jan 2026 07:56:25 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769010985; x=1769615785; 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=6idYD0AKGESVEMq5nLW+uYD0VvpAsFD+VjX/8Dx4wWo=; b=Q3i9y+LzTCGNrPB+kdFjJOCPqeL9w/UKjJMNfNme8zQL+1tqFWwb7YCsWz4W3Uu0y7 knp0xCajenbM8Ywqf1aihxiU0pGCqQJVeLWG3i1xSR3y8xj3pHw/0mPPHk2GNBjNkfQa NX6UChrQfqEVj+NB2TooT4JCFUVww32GYtQ1ZHY0kDKgVwa6gW7BdahHOsc92t0Z1LpY xqx5Iswlrn07FbP/Pdmo8xTkku/UnEwOE2i5KVGhrv/BZWnuesSsPzoZWJk7XqVWUh9n r8v+ikG2bITgBZNmnUWb7QjFhOGEWBaPWwV7yt1/6hLk0tIAUl/P23GB+uzue++/toqo HTiw== X-Forwarded-Encrypted: i=1; AJvYcCUYK2iNN162YRbif3clMicylPqZUnfRGn2XaReypAEqDml5cSC6Dxl7/0Fp/lPUn9UimepaixHYqSeW9I4=@vger.kernel.org X-Gm-Message-State: AOJu0YygEKJngCjt534Hn8tfM/mBUWpuetkVtRkDpQgzCMxMKTK3XR75 DqF70cQ/XkeZ9G807MStTtamf5vRGXamzWkv0GfR27b3LpSfJ3yaSmM7 X-Gm-Gg: AZuq6aIBZMjhWjUvBhjFxHACk2KxAhzqiznf8/8aDrRYndHZIX+0nw2by2QVD/0DcnQ vocaaXkSJ8r+/zraV7UhtsQlaShfUCYE6yCT1RqCKxMoJlEhv0mK/oDmc76nMUa2rEINf15nZLM q2mj3iRhs83bjdiEVBm3H3bGSheVd16eouT7C9rqrowt+0EFpFjCSFp0pIx0IxKzwmuDuOZUUDf +mnML7W+CSCyLFPtPK6gAQcpUjwQqQr7znBvXJqWvnnEXxVq0zhNCaj6NTulvjIae6DuPm4Z+A/ c3CIU5avUnf1X2y4Jpiy0OoB4eT2fsEFSGWcyMDePz9zvI4UEBvnXKJSHIIRqPPz9rsG3tw3mnh iILfkmvLh7eofnr0S3EbRV/N9ER7d88HWtPvtRihpIGydSuktrfgM+6TLbu6Ce6XDSXwQgULPzz i5IQ== X-Received: by 2002:a05:6808:1801:b0:453:50af:c463 with SMTP id 5614622812f47-45c9c14fd86mr6820343b6e.41.1769010984991; Wed, 21 Jan 2026 07:56:24 -0800 (PST) Received: from localhost ([2a03:2880:10ff:44::]) by smtp.gmail.com with ESMTPSA id 5614622812f47-45c9e03faa4sm8763844b6e.18.2026.01.21.07.56.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Jan 2026 07:56:24 -0800 (PST) From: Breno Leitao Date: Wed, 21 Jan 2026 07:54:42 -0800 Subject: [PATCH net-next 5/9] net: fbnic: 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-5-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=1641; i=leitao@debian.org; h=from:subject:message-id; bh=IMKgxRU1sol0qv3q4ykIX98inRbeR6UTILUypHJQ1KU=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBpcPcimRzZNJSf4d1IZxSV2HQSnbvSRZ+5v/wtx 2BlvP6rC5KJAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCaXD3IgAKCRA1o5Of/Hh3 bRjCEACgNH/DrBH3/TwdObeQBxDKQ7ri1VmY7UxH12naM375gcloF5oYaCC0Pk01M7Ncq72hwni gLDjbTsuQydWPhTRSh+jRQNZqUts5/jMyls9SMBdv7gqyKL5fg68fljW6jg9h/YpPbAF0CuSpvA SN7HeNH6i1WOl84JyeUA0QCGOknwIIkHSpBJ46s+d1h/RMLx1zlFhSk1FHeTyOjaBnthP1AWnn1 hkzCGVgZ6hK4rbqjE0t7K0k+HS1X7oWJ3/KOG/f9vjeEwKO4kpSOszKoSBcDZl3YuggjxKJY6qz r6Dvx8Iuj3Svowtx2cmQvBUsEm2MMum8aOBkKo+InxoOs3YFrDrkqjkge0d35p8CF+D+ckWsmyR fae5k1dxkVjFpMGsltyMCv5KqSwBd3cOXtVf4EzCmhkADGnjfhVG5GE7XS/c2hN8GMMS2E4hyun uN0ZY9ze9aISu4y9s6LStKVnwxkwGOOoVvjIQo+iw9RpKPo2wFtl6DdSg3D/Frk4goh40hhBnS8 viYUzFM/O6c8LzxKV/6uiM1d0+V7UOZxQj4oDT1/4KvisfOkF8lA4IhibwuRGscXVLr7oe0n811 yETZIMGNqb/cRZLWJYwq3SNJNcFkD0xnzSG9RdO3eoluiG6lMzQsfYnr3jZQluo1wZHI3ECecXY 3fRz+TAC8y16fZA== 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/meta/fbnic/fbnic_ethtool.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/meta/fbnic/fbnic_ethtool.c b/drivers/net/ethernet/meta/fbnic/fbnic_ethtool.c index 61b8005a0db5f..11745a2d8a443 100644 --- a/drivers/net/ethernet/meta/fbnic/fbnic_ethtool.c +++ b/drivers/net/ethernet/meta/fbnic/fbnic_ethtool.c @@ -825,6 +825,13 @@ static int fbnic_get_cls_rule(struct fbnic_net *fbn, struct ethtool_rxnfc *cmd) return 0; } +static u32 fbnic_get_rx_ring_count(struct net_device *netdev) +{ + struct fbnic_net *fbn = netdev_priv(netdev); + + return fbn->num_rx_queues; +} + static int fbnic_get_rxnfc(struct net_device *netdev, struct ethtool_rxnfc *cmd, u32 *rule_locs) { @@ -833,10 +840,6 @@ static int fbnic_get_rxnfc(struct net_device *netdev, u32 special = 0; switch (cmd->cmd) { - case ETHTOOL_GRXRINGS: - cmd->data = fbn->num_rx_queues; - ret = 0; - break; case ETHTOOL_GRXCLSRULE: ret = fbnic_get_cls_rule(fbn, cmd); break; @@ -1895,6 +1898,7 @@ static const struct ethtool_ops fbnic_ethtool_ops = { .get_sset_count = fbnic_get_sset_count, .get_rxnfc = fbnic_get_rxnfc, .set_rxnfc = fbnic_set_rxnfc, + .get_rx_ring_count = fbnic_get_rx_ring_count, .get_rxfh_key_size = fbnic_get_rxfh_key_size, .get_rxfh_indir_size = fbnic_get_rxfh_indir_size, .get_rxfh = fbnic_get_rxfh, -- 2.47.3