[PATCH net-next 6/9] net: ionic: convert to use .get_rx_ring_count

Breno Leitao posted 9 patches 2 weeks, 5 days ago
There is a newer version of this series
[PATCH net-next 6/9] net: ionic: convert to use .get_rx_ring_count
Posted by Breno Leitao 2 weeks, 5 days ago
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: Breno Leitao <leitao@debian.org>
---
 drivers/net/ethernet/pensando/ionic/ionic_ethtool.c | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

diff --git a/drivers/net/ethernet/pensando/ionic/ionic_ethtool.c b/drivers/net/ethernet/pensando/ionic/ionic_ethtool.c
index 2d9efadb5d2ae..b0a459eeaa640 100644
--- a/drivers/net/ethernet/pensando/ionic/ionic_ethtool.c
+++ b/drivers/net/ethernet/pensando/ionic/ionic_ethtool.c
@@ -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,

-- 
2.47.3
Re: [PATCH net-next 6/9] net: ionic: convert to use .get_rx_ring_count
Posted by Creeley, Brett 2 weeks, 5 days ago

On 1/21/2026 7:54 AM, Breno Leitao wrote:
> Caution: This message originated from an External Source. Use proper caution when opening attachments, clicking links, or responding.
>
>
> 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: Breno Leitao <leitao@debian.org>
> ---
>   drivers/net/ethernet/pensando/ionic/ionic_ethtool.c | 18 +++---------------
>   1 file changed, 3 insertions(+), 15 deletions(-)
>
> diff --git a/drivers/net/ethernet/pensando/ionic/ionic_ethtool.c b/drivers/net/ethernet/pensando/ionic/ionic_ethtool.c
> index 2d9efadb5d2ae..b0a459eeaa640 100644
> --- a/drivers/net/ethernet/pensando/ionic/ionic_ethtool.c
> +++ b/drivers/net/ethernet/pensando/ionic/ionic_ethtool.c
> @@ -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,

LGTM. Thanks.

Reviewed-by: Brett Creeley <brett.creeley@amd.com>

>          .get_rxfh_indir_size    = ionic_get_rxfh_indir_size,
>          .get_rxfh_key_size      = ionic_get_rxfh_key_size,
>          .get_rxfh               = ionic_get_rxfh,
>
> --
> 2.47.3
>