sfc: Rename efx_wanted_channels() to efx_wanted_parallelism()
authorBen Hutchings <bhutchings@solarflare.com>
Tue, 20 Dec 2011 01:15:30 +0000 (01:15 +0000)
committerBen Hutchings <bhutchings@solarflare.com>
Mon, 9 Jan 2012 17:08:17 +0000 (17:08 +0000)
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>
drivers/net/ethernet/sfc/efx.c

index 9ca5dcd..5fcc42f 100644 (file)
@@ -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);