Re: [PATCH net-next] tg3: extract GRXRINGS from .get_rxnfc

From: Simon Horman

Date: Fri Nov 07 2025 - 06:04:27 EST


On Thu, Nov 06, 2025 at 10:45:21AM -0800, Michael Chan wrote:
> On Thu, Nov 6, 2025 at 9:06 AM Breno Leitao <leitao@xxxxxxxxxx> wrote:
> > tg3: Fix num of RX queues being reported by ethtool
> >
> > Using num_online_cpus() to report number of queues is actually not
> > correct, as reported by Michael[1].
> >
> > netif_get_num_default_rss_queues() was used to replace num_online_cpus()
> > in the past, but tg3 ethtool callbacks didn't get converted. Doing it
> > now.
> >
> > Link: https://lore.kernel.org/all/CACKFLim7ruspmqvjr6bNRq5Z_XXVk3vVaLZOons7kMCzsEG23A@xxxxxxxxxxxxxx/#t [1]
> >
> > Signed-off-by: Breno Leitao <leitao@xxxxxxxxxx>
> > Suggested-by: Michael Chan <michael.chan@xxxxxxxxxxxx>
> >
> > diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c
> > index fa58c3ffceb06..5fdaee7ef9d7a 100644
> > --- a/drivers/net/ethernet/broadcom/tg3.c
> > +++ b/drivers/net/ethernet/broadcom/tg3.c
> > @@ -12729,7 +12729,7 @@ static u32 tg3_get_rx_ring_count(struct net_device *dev)
> > if (netif_running(tp->dev))
> > return tp->rxq_cnt;
> >
> > - return min(num_online_cpus(), TG3_RSS_MAX_NUM_QS);
> > + return min((u32) netif_get_num_default_rss_queues(), tp->rxq_max);
>
> Isn't it better to use min_t()?

FWIIW, umin() seems appropriate to me.

Commit 80fcac55385c ("minmax: add umin(a, b) and umax(a, b)")
includes quite a long explanation of why it exists.
And that does seem to match this case.