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

net: ionic: 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().

Since ETHTOOL_GRXRINGS was the only command handled by ionic_get_rxnfc(),
remove the function entirely.

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-6-94dbe4dcaa10@debian.org


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

drivers/net/ethernet/pensando/ionic/ionic_ethtool.c

+3 −15
Original line number Diff line number Diff line
@@ -843,23 +843,11 @@ static int ionic_set_channels(struct net_device *netdev, 
	return err;

}



static int ionic_get_rxnfc(struct net_device *netdev,

			   struct ethtool_rxnfc *info, u32 *rules)

static u32 ionic_get_rx_ring_count(struct net_device *netdev)

{

	struct ionic_lif *lif = netdev_priv(netdev);

	int err = 0;



	switch (info->cmd) {

	case ETHTOOL_GRXRINGS:

		info->data = lif->nxqs;

		break;

	default:

		netdev_dbg(netdev, "Command parameter %d is not supported\n",

			   info->cmd);

		err = -EOPNOTSUPP;

	}



	return err;

	return lif->nxqs;

}



static u32 ionic_get_rxfh_indir_size(struct net_device *netdev)
@@ -1152,7 +1140,7 @@ static const struct ethtool_ops ionic_ethtool_ops = { 
	.get_strings		= ionic_get_strings,

	.get_ethtool_stats	= ionic_get_stats,

	.get_sset_count		= ionic_get_sset_count,

	.get_rxnfc		= ionic_get_rxnfc,

	.get_rx_ring_count	= ionic_get_rx_ring_count,

	.get_rxfh_indir_size	= ionic_get_rxfh_indir_size,

	.get_rxfh_key_size	= ionic_get_rxfh_key_size,

	.get_rxfh		= ionic_get_rxfh,