diff options
| author | Ben Hutchings <bhutchings@solarflare.com> | 2011-12-20 01:15:30 +0000 |
|---|---|---|
| committer | Ben Hutchings <bhutchings@solarflare.com> | 2012-01-09 17:08:17 +0000 |
| commit | fa142b9da3393fd92b398b6bdecf3f21914e309b (patch) | |
| tree | 5cf4a1b0d0b6acb23b3b9fb8f4150b2f4e8b51e2 | |
| parent | 05a9320f7e64b69cbf612a69b7358546519ffc30 (diff) | |
| download | talos-obmc-linux-fa142b9da3393fd92b398b6bdecf3f21914e309b.tar.gz talos-obmc-linux-fa142b9da3393fd92b398b6bdecf3f21914e309b.zip | |
sfc: Rename efx_wanted_channels() to efx_wanted_parallelism()
This function returns the degree of parallelism wanted, which is not
necessarily the total number of channels we want to create.
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
| -rw-r--r-- | drivers/net/ethernet/sfc/efx.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/ethernet/sfc/efx.c b/drivers/net/ethernet/sfc/efx.c index 9ca5dcdf5a86..5fcc42f7d865 100644 --- a/drivers/net/ethernet/sfc/efx.c +++ b/drivers/net/ethernet/sfc/efx.c @@ -1146,9 +1146,7 @@ static void efx_fini_io(struct efx_nic *efx) pci_disable_device(efx->pci_dev); } -/* Get number of channels wanted. Each channel will have its own IRQ, - * 1 RX queue and/or 2 TX queues. */ -static int efx_wanted_channels(void) +static int efx_wanted_parallelism(void) { cpumask_var_t core_mask; int count; @@ -1211,7 +1209,7 @@ static int efx_probe_interrupts(struct efx_nic *efx) struct msix_entry xentries[EFX_MAX_CHANNELS]; int n_channels; - n_channels = efx_wanted_channels(); + n_channels = efx_wanted_parallelism(); if (separate_tx_channels) n_channels *= 2; n_channels = min(n_channels, max_channels); |
