Commit 3399fd51 authored by Breno Leitao's avatar Breno Leitao Committed by Jakub Kicinski
Browse files

ixgbevf: extract GRXRINGS from .get_rxnfc 



Commit 84eaf435 ("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 ixgbevf with the new
ethtool API for querying RX ring parameters.

Signed-off-by: default avatarBreno Leitao <leitao@debian.org>
Signed-off-by: default avatarAleksandr Loktionov <aleksandr.loktionov@intel.com>
Link: https://patch.msgid.link/20251125-gxring_intel-v2-7-f55cd022d28b@debian.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 768ce58d

drivers/net/ethernet/intel/ixgbevf/ethtool.c

+3 −11
Original line number Diff line number Diff line
@@ -867,19 +867,11 @@ static int ixgbevf_set_coalesce(struct net_device *netdev, 
	return 0;

}



static int ixgbevf_get_rxnfc(struct net_device *dev, struct ethtool_rxnfc *info,

			     u32 *rules __always_unused)

static u32 ixgbevf_get_rx_ring_count(struct net_device *dev)

{

	struct ixgbevf_adapter *adapter = netdev_priv(dev);



	switch (info->cmd) {

	case ETHTOOL_GRXRINGS:

		info->data = adapter->num_rx_queues;

		return 0;

	default:

		hw_dbg(&adapter->hw, "Command parameters not supported\n");

		return -EOPNOTSUPP;

	}

	return adapter->num_rx_queues;

}



static u32 ixgbevf_get_rxfh_indir_size(struct net_device *netdev)
@@ -987,7 +979,7 @@ static const struct ethtool_ops ixgbevf_ethtool_ops = { 
	.get_ethtool_stats	= ixgbevf_get_ethtool_stats,

	.get_coalesce		= ixgbevf_get_coalesce,

	.set_coalesce		= ixgbevf_set_coalesce,

	.get_rxnfc		= ixgbevf_get_rxnfc,

	.get_rx_ring_count	= ixgbevf_get_rx_ring_count,

	.get_rxfh_indir_size	= ixgbevf_get_rxfh_indir_size,

	.get_rxfh_key_size	= ixgbevf_get_rxfh_key_size,

	.get_rxfh		= ixgbevf_get_rxfh,