> -----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 5/8] igb: 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 igb with the > new ethtool API for querying RX ring parameters. > > Signed-off-by: Breno Leitao <[email protected]> > --- > drivers/net/ethernet/intel/igb/igb_ethtool.c | 12 ++++++++---- > 1 file changed, 8 insertions(+), 4 deletions(-) > > diff --git a/drivers/net/ethernet/intel/igb/igb_ethtool.c > b/drivers/net/ethernet/intel/igb/igb_ethtool.c > index 10e2445e0ded..b507576b28b2 100644 > --- a/drivers/net/ethernet/intel/igb/igb_ethtool.c > +++ b/drivers/net/ethernet/intel/igb/igb_ethtool.c > @@ -2541,6 +2541,13 @@ static int igb_get_rxfh_fields(struct > net_device *dev, > return 0; > } > > +static u32 igb_get_rx_ring_count(struct net_device *dev) { > + struct igb_adapter *adapter = netdev_priv(dev); > + > + return adapter->num_rx_queues; > +} > + > static int igb_get_rxnfc(struct net_device *dev, struct ethtool_rxnfc > *cmd, > u32 *rule_locs) > { > @@ -2548,10 +2555,6 @@ static int igb_get_rxnfc(struct net_device > *dev, struct ethtool_rxnfc *cmd, > int ret = -EOPNOTSUPP; > > switch (cmd->cmd) { > - case ETHTOOL_GRXRINGS: > - cmd->data = adapter->num_rx_queues; > - ret = 0; > - break; > case ETHTOOL_GRXCLSRLCNT: > cmd->rule_cnt = adapter->nfc_filter_count; > ret = 0; > @@ -3473,6 +3476,7 @@ static const struct ethtool_ops igb_ethtool_ops > = { > .get_ts_info = igb_get_ts_info, > .get_rxnfc = igb_get_rxnfc, > .set_rxnfc = igb_set_rxnfc, > + .get_rx_ring_count = igb_get_rx_ring_count, > .get_eee = igb_get_eee, > .set_eee = igb_set_eee, > .get_module_info = igb_get_module_info, > > -- > 2.47.3
Signed-off-by: Aleksandr Loktionov <[email protected]>
