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

iavf: 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 iavf 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-2-f55cd022d28b@debian.org


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

drivers/net/ethernet/intel/iavf/iavf_ethtool.c

+14 −4
Original line number Diff line number Diff line
@@ -1638,6 +1638,19 @@ static int iavf_set_rxnfc(struct net_device *netdev, struct ethtool_rxnfc *cmd) 
	return ret;

}



/**

 * iavf_get_rx_ring_count - get RX ring count

 * @netdev: network interface device structure

 *

 * Return: number of RX rings.

 **/

static u32 iavf_get_rx_ring_count(struct net_device *netdev)

{

	struct iavf_adapter *adapter = netdev_priv(netdev);



	return adapter->num_active_queues;

}



/**

 * iavf_get_rxnfc - command to get RX flow classification rules

 * @netdev: network interface device structure
@@ -1653,10 +1666,6 @@ static int iavf_get_rxnfc(struct net_device *netdev, struct ethtool_rxnfc *cmd, 
	int ret = -EOPNOTSUPP;



	switch (cmd->cmd) {

	case ETHTOOL_GRXRINGS:

		cmd->data = adapter->num_active_queues;

		ret = 0;

		break;

	case ETHTOOL_GRXCLSRLCNT:

		if (!(adapter->flags & IAVF_FLAG_FDIR_ENABLED))

			break;
@@ -1866,6 +1875,7 @@ static const struct ethtool_ops iavf_ethtool_ops = { 
	.set_per_queue_coalesce = iavf_set_per_queue_coalesce,

	.set_rxnfc		= iavf_set_rxnfc,

	.get_rxnfc		= iavf_get_rxnfc,

	.get_rx_ring_count	= iavf_get_rx_ring_count,

	.get_rxfh_indir_size	= iavf_get_rxfh_indir_size,

	.get_rxfh		= iavf_get_rxfh,

	.set_rxfh		= iavf_set_rxfh,