On 15/01/2026 at 15:37, Breno Leitao wrote:
> Use the newly introduced .get_rx_ring_count ethtool ops callback instead
> of handling ETHTOOL_GRXRINGS directly in .get_rxnfc().
>
> Signed-off-by: Breno Leitao <leitao@debian.org>
Looks good to me:
Acked-by: Nicolas Ferre <nicolas.ferre@microchip.com>
Thanks, best regards,
Nicolas
> ---
> drivers/net/ethernet/cadence/macb_main.c | 11 ++++++++---
> 1 file changed, 8 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c
> index 2d5f3eb09530..8135c5c2a51a 100644
> --- a/drivers/net/ethernet/cadence/macb_main.c
> +++ b/drivers/net/ethernet/cadence/macb_main.c
> @@ -3850,6 +3850,13 @@ static int gem_get_all_flow_entries(struct net_device *netdev,
> return 0;
> }
>
> +static u32 gem_get_rx_ring_count(struct net_device *netdev)
> +{
> + struct macb *bp = netdev_priv(netdev);
> +
> + return bp->num_queues;
> +}
> +
> static int gem_get_rxnfc(struct net_device *netdev, struct ethtool_rxnfc *cmd,
> u32 *rule_locs)
> {
> @@ -3857,9 +3864,6 @@ static int gem_get_rxnfc(struct net_device *netdev, struct ethtool_rxnfc *cmd,
> int ret = 0;
>
> switch (cmd->cmd) {
> - case ETHTOOL_GRXRINGS:
> - cmd->data = bp->num_queues;
> - break;
> case ETHTOOL_GRXCLSRLCNT:
> cmd->rule_cnt = bp->rx_fs_list.count;
> break;
> @@ -3941,6 +3945,7 @@ static const struct ethtool_ops gem_ethtool_ops = {
> .set_ringparam = macb_set_ringparam,
> .get_rxnfc = gem_get_rxnfc,
> .set_rxnfc = gem_set_rxnfc,
> + .get_rx_ring_count = gem_get_rx_ring_count,
> };
>
> static int macb_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
>
> --
> 2.47.3
>