[Intel-wired-lan] [PATCH net-next 6/8] igc: extract GRXRINGS from .get_rxnfc

[Loktionov, Aleksandr]

> -----Original Message-----
> From: Intel-wired-lan <intel-wired-lan-bounces at osuosl.org> On Behalf
> Of Breno Leitao
> Sent: Monday, November 24, 2025 7:19 PM
> To: Lobakin, Aleksander <aleksander.lobakin at intel.com>; Nguyen,
> Anthony L <anthony.l.nguyen at intel.com>; Kitszel, Przemyslaw
> <przemyslaw.kitszel at intel.com>; Andrew Lunn <andrew+netdev at lunn.ch>;
> David S. Miller <davem at davemloft.net>; Eric Dumazet
> <edumazet at google.com>; Jakub Kicinski <kuba at kernel.org>; Paolo Abeni
> <pabeni at redhat.com>
> Cc: michal.swiatkowski at linux.intel.com; michal.kubiak at intel.com;
> Fijalkowski, Maciej <maciej.fijalkowski at intel.com>; intel-wired-
> lan at lists.osuosl.org; netdev at vger.kernel.org; linux-
> kernel at vger.kernel.org; kernel-team at meta.com; Breno Leitao
> <leitao at debian.org>
> Subject: [Intel-wired-lan] [PATCH net-next 6/8] igc: extract GRXRINGS
> from .get_rxnfc
> 
> 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 igc with the
> new ethtool API for querying RX ring parameters.
> 
> Signed-off-by: Breno Leitao <leitao at debian.org>
> ---
>  drivers/net/ethernet/intel/igc/igc_ethtool.c | 11 ++++++++---
>  1 file changed, 8 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/net/ethernet/intel/igc/igc_ethtool.c
> b/drivers/net/ethernet/intel/igc/igc_ethtool.c
> index bb783042d1af..e94c1922b97a 100644
> --- a/drivers/net/ethernet/intel/igc/igc_ethtool.c
> +++ b/drivers/net/ethernet/intel/igc/igc_ethtool.c
> @@ -1091,15 +1091,19 @@ static int igc_ethtool_get_rxfh_fields(struct
> net_device *dev,
>  	return 0;
>  }
> 
> +static u32 igc_ethtool_get_rx_ring_count(struct net_device *dev) {
> +	struct igc_adapter *adapter = netdev_priv(dev);
> +
> +	return adapter->num_rx_queues;
> +}
> +
>  static int igc_ethtool_get_rxnfc(struct net_device *dev,
>  				 struct ethtool_rxnfc *cmd, u32 *rule_locs)
> {
>  	struct igc_adapter *adapter = netdev_priv(dev);
> 
>  	switch (cmd->cmd) {
> -	case ETHTOOL_GRXRINGS:
> -		cmd->data = adapter->num_rx_queues;
> -		return 0;
>  	case ETHTOOL_GRXCLSRLCNT:
>  		cmd->rule_cnt = adapter->nfc_rule_count;
>  		return 0;
> @@ -2170,6 +2174,7 @@ static const struct ethtool_ops igc_ethtool_ops
> = {
>  	.set_coalesce		= igc_ethtool_set_coalesce,
>  	.get_rxnfc		= igc_ethtool_get_rxnfc,
>  	.set_rxnfc		= igc_ethtool_set_rxnfc,
> +	.get_rx_ring_count	= igc_ethtool_get_rx_ring_count,
>  	.get_rxfh_indir_size	= igc_ethtool_get_rxfh_indir_size,
>  	.get_rxfh		= igc_ethtool_get_rxfh,
>  	.set_rxfh		= igc_ethtool_set_rxfh,
> 
> --
> 2.47.3

Signed-off-by: Aleksandr Loktionov <aleksandr.loktionov at intel.com>