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

igb: 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 igb 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-5-f55cd022d28b@debian.org


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

drivers/net/ethernet/intel/igb/igb_ethtool.c

+8 −4
Original line number Diff line number Diff line
@@ -2541,6 +2541,13 @@ static int igb_get_rxfh_fields(struct net_device *dev, 
	return 0;

}



static u32 igb_get_rx_ring_count(struct net_device *dev)

{

	struct igb_adapter *adapter = netdev_priv(dev);



	return adapter->num_rx_queues;

}



static int igb_get_rxnfc(struct net_device *dev, struct ethtool_rxnfc *cmd,

			 u32 *rule_locs)

{
@@ -2548,10 +2555,6 @@ static int igb_get_rxnfc(struct net_device *dev, struct ethtool_rxnfc *cmd, 
	int ret = -EOPNOTSUPP;



	switch (cmd->cmd) {

	case ETHTOOL_GRXRINGS:

		cmd->data = adapter->num_rx_queues;

		ret = 0;

		break;

	case ETHTOOL_GRXCLSRLCNT:

		cmd->rule_cnt = adapter->nfc_filter_count;

		ret = 0;
@@ -3473,6 +3476,7 @@ static const struct ethtool_ops igb_ethtool_ops = { 
	.get_ts_info		= igb_get_ts_info,

	.get_rxnfc		= igb_get_rxnfc,

	.set_rxnfc		= igb_set_rxnfc,

	.get_rx_ring_count	= igb_get_rx_ring_count,

	.get_eee		= igb_get_eee,

	.set_eee		= igb_set_eee,

	.get_module_info	= igb_get_module_info,