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

net: sfc: efx: convert to use .get_rx_ring_count 



Use the newly introduced .get_rx_ring_count ethtool ops callback instead
of handling ETHTOOL_GRXRINGS directly in .get_rxnfc().

Signed-off-by: default avatarBreno Leitao <leitao@debian.org>
Reviewed-by: default avatarBrett Creeley <brett.creeley@amd.com>
Link: https://patch.msgid.link/20260122-grxring_big_v4-v2-7-94dbe4dcaa10@debian.org


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

drivers/net/ethernet/sfc/ef100_ethtool.c

+1 −0
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ const struct ethtool_ops ef100_ethtool_ops = { 
	.get_ethtool_stats	= efx_ethtool_get_stats,

	.get_rxnfc              = efx_ethtool_get_rxnfc,

	.set_rxnfc              = efx_ethtool_set_rxnfc,

	.get_rx_ring_count	= efx_ethtool_get_rx_ring_count,

	.reset                  = efx_ethtool_reset,



	.get_rxfh_indir_size	= efx_ethtool_get_rxfh_indir_size,

drivers/net/ethernet/sfc/ethtool.c

+1 −0
Original line number Diff line number Diff line
@@ -261,6 +261,7 @@ const struct ethtool_ops efx_ethtool_ops = { 
	.reset			= efx_ethtool_reset,

	.get_rxnfc		= efx_ethtool_get_rxnfc,

	.set_rxnfc		= efx_ethtool_set_rxnfc,

	.get_rx_ring_count	= efx_ethtool_get_rx_ring_count,

	.get_rxfh_indir_size	= efx_ethtool_get_rxfh_indir_size,

	.get_rxfh_key_size	= efx_ethtool_get_rxfh_key_size,

	.rxfh_per_ctx_fields	= true,

drivers/net/ethernet/sfc/ethtool_common.c

+7 −4
Original line number Diff line number Diff line
@@ -850,6 +850,13 @@ int efx_ethtool_get_rxfh_fields(struct net_device *net_dev, 
	return rc;

}



u32 efx_ethtool_get_rx_ring_count(struct net_device *net_dev)

{

	struct efx_nic *efx = efx_netdev_priv(net_dev);



	return efx->n_rx_channels;

}



int efx_ethtool_get_rxnfc(struct net_device *net_dev,

			  struct ethtool_rxnfc *info, u32 *rule_locs)

{
@@ -858,10 +865,6 @@ int efx_ethtool_get_rxnfc(struct net_device *net_dev, 
	s32 rc = 0;



	switch (info->cmd) {

	case ETHTOOL_GRXRINGS:

		info->data = efx->n_rx_channels;

		return 0;



	case ETHTOOL_GRXCLSRLCNT:

		info->data = efx_filter_get_rx_id_limit(efx);

		if (info->data == 0)

drivers/net/ethernet/sfc/ethtool_common.h

+1 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ int efx_ethtool_set_fecparam(struct net_device *net_dev, 
			     struct ethtool_fecparam *fecparam);

int efx_ethtool_get_rxnfc(struct net_device *net_dev,

			  struct ethtool_rxnfc *info, u32 *rule_locs);

u32 efx_ethtool_get_rx_ring_count(struct net_device *net_dev);

int efx_ethtool_set_rxnfc(struct net_device *net_dev,

			  struct ethtool_rxnfc *info);

u32 efx_ethtool_get_rxfh_indir_size(struct net_device *net_dev);