> -----Original Message----- > From: Intel-wired-lan <[email protected]> On Behalf > Of Breno Leitao > Sent: Monday, November 24, 2025 7:19 PM > To: Lobakin, Aleksander <[email protected]>; Nguyen, > Anthony L <[email protected]>; Kitszel, Przemyslaw > <[email protected]>; Andrew Lunn <[email protected]>; > David S. Miller <[email protected]>; Eric Dumazet > <[email protected]>; Jakub Kicinski <[email protected]>; Paolo Abeni > <[email protected]> > Cc: [email protected]; [email protected]; > Fijalkowski, Maciej <[email protected]>; intel-wired- > [email protected]; [email protected]; linux- > [email protected]; [email protected]; Breno Leitao > <[email protected]> > Subject: [Intel-wired-lan] [PATCH net-next 8/8] fm10k: extract > GRXRINGS from .get_rxnfc > > Commit 84eaf4359c36 ("net: ethtool: add get_rx_ring_count callback to > optimize RX ring queries") added specific support for GRXRINGS > callback, simplifying .get_rxnfc. > > Remove the handling of GRXRINGS in .get_rxnfc() by moving it to the > new .get_rx_ring_count(). > > This simplifies the RX ring count retrieval and aligns fm10k with the > new ethtool API for querying RX ring parameters. > > Signed-off-by: Breno Leitao <[email protected]> > --- > drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c | 17 +++------------ > -- > 1 file changed, 3 insertions(+), 14 deletions(-) > > diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c > b/drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c > index bf2029144c1d..76e42abca965 100644 > --- a/drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c > +++ b/drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c > @@ -734,22 +734,11 @@ static int fm10k_get_rssh_fields(struct > net_device *dev, > return 0; > } > > -static int fm10k_get_rxnfc(struct net_device *dev, struct > ethtool_rxnfc *cmd, > - u32 __always_unused *rule_locs) > +static u32 fm10k_get_rx_ring_count(struct net_device *dev) > { > struct fm10k_intfc *interface = netdev_priv(dev); > - int ret = -EOPNOTSUPP; > > - switch (cmd->cmd) { > - case ETHTOOL_GRXRINGS: > - cmd->data = interface->num_rx_queues; > - ret = 0; > - break; > - default: > - break; > - } > - > - return ret; > + return interface->num_rx_queues; > } > > static int fm10k_set_rssh_fields(struct net_device *dev, @@ -1160,7 > +1149,7 @@ static const struct ethtool_ops fm10k_ethtool_ops = { > .set_ringparam = fm10k_set_ringparam, > .get_coalesce = fm10k_get_coalesce, > .set_coalesce = fm10k_set_coalesce, > - .get_rxnfc = fm10k_get_rxnfc, > + .get_rx_ring_count = fm10k_get_rx_ring_count, > .get_regs = fm10k_get_regs, > .get_regs_len = fm10k_get_regs_len, > .self_test = fm10k_self_test, > > -- > 2.47.3
Signed-off-by: Aleksandr Loktionov <[email protected]>
