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

i40e: 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 i40e 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-1-f55cd022d28b@debian.org


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

drivers/net/ethernet/intel/i40e/i40e_ethtool.c

+15 −4
Original line number Diff line number Diff line
@@ -3521,6 +3521,20 @@ static int i40e_get_ethtool_fdir_entry(struct i40e_pf *pf, 
	return 0;

}



/**

 * i40e_get_rx_ring_count - get RX ring count

 * @netdev: network interface device structure

 *

 * Return: number of RX rings.

 **/

static u32 i40e_get_rx_ring_count(struct net_device *netdev)

{

	struct i40e_netdev_priv *np = netdev_priv(netdev);

	struct i40e_vsi *vsi = np->vsi;



	return vsi->rss_size;

}



/**

 * i40e_get_rxnfc - command to get RX flow classification rules

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



	switch (cmd->cmd) {

	case ETHTOOL_GRXRINGS:

		cmd->data = vsi->rss_size;

		ret = 0;

		break;

	case ETHTOOL_GRXCLSRLCNT:

		cmd->rule_cnt = pf->fdir_pf_active_filters;

		/* report total rule count */
@@ -5819,6 +5829,7 @@ static const struct ethtool_ops i40e_ethtool_ops = { 
	.set_msglevel		= i40e_set_msglevel,

	.get_rxnfc		= i40e_get_rxnfc,

	.set_rxnfc		= i40e_set_rxnfc,

	.get_rx_ring_count	= i40e_get_rx_ring_count,

	.self_test		= i40e_diag_test,

	.get_strings		= i40e_get_strings,

	.get_eee		= i40e_get_eee,