sfc: commonise netif_set_real_num[tr]x_queues calls (69a70496) · Commits · 戴 / test

drivers/net/ethernet/sfc/efx.c

+0 −3

Original line number	Diff line number	Diff line
		@@ -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,

+6 −1

Original line number	Diff line number	Diff line
		@@ -856,6 +856,7 @@ int efx_set_channels(struct efx_nic *efx)
		struct efx_channel *channel;
		struct efx_tx_queue *tx_queue;
		int xdp_queue_number;
		int rc;

		efx->tx_channel_offset =
		efx_separate_tx_channels ?
		@@ -894,7 +895,11 @@ int efx_set_channels(struct efx_nic *efx)
		}
		}
		}
		return 0;

		rc = netif_set_real_num_tx_queues(efx->net_dev, efx->n_tx_channels);
		if (rc)
		return rc;
		return netif_set_real_num_rx_queues(efx->net_dev, efx->n_rx_channels);
		}

		bool efx_default_channel_want_txqs(struct efx_channel *channel)