On Wed, 1 Jul 2020 15:53:15 +0100 Edward Cree wrote: > Signed-off-by: Edward Cree <ec...@solarflare.com> > --- > drivers/net/ethernet/sfc/efx.c | 3 --- > drivers/net/ethernet/sfc/efx_channels.c | 4 ++++ > 2 files changed, 4 insertions(+), 3 deletions(-) > > diff --git a/drivers/net/ethernet/sfc/efx.c b/drivers/net/ethernet/sfc/efx.c > index f4173f855438..9f659cc34252 100644 > --- a/drivers/net/ethernet/sfc/efx.c > +++ b/drivers/net/ethernet/sfc/efx.c > @@ -336,9 +336,6 @@ static int efx_probe_nic(struct efx_nic *efx) > sizeof(efx->rss_context.rx_hash_key)); > efx_set_default_rx_indir_table(efx, &efx->rss_context); > > - netif_set_real_num_tx_queues(efx->net_dev, efx->n_tx_channels); > - netif_set_real_num_rx_queues(efx->net_dev, efx->n_rx_channels); > - > /* Initialise the interrupt moderation settings */ > efx->irq_mod_step_us = DIV_ROUND_UP(efx->timer_quantum_ns, 1000); > efx_init_irq_moderation(efx, tx_irq_mod_usec, rx_irq_mod_usec, true, > diff --git a/drivers/net/ethernet/sfc/efx_channels.c > b/drivers/net/ethernet/sfc/efx_channels.c > index 41bf18f2b081..dd6ee60b66a0 100644 > --- a/drivers/net/ethernet/sfc/efx_channels.c > +++ b/drivers/net/ethernet/sfc/efx_channels.c > @@ -894,6 +894,10 @@ int efx_set_channels(struct efx_nic *efx) > } > } > } > + > + netif_set_real_num_tx_queues(efx->net_dev, efx->n_tx_channels); > + netif_set_real_num_rx_queues(efx->net_dev, efx->n_rx_channels);
For a third time in last 7 days - these can fail :) I know you're just moving them, but perhaps worth cleaning this up..
