diff options
Diffstat (limited to 'drivers')
-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) | |||
1146 | pci_disable_device(efx->pci_dev); | 1146 | pci_disable_device(efx->pci_dev); |
1147 | } | 1147 | } |
1148 | 1148 | ||
1149 | /* Get number of channels wanted. Each channel will have its own IRQ, | 1149 | static int efx_wanted_parallelism(void) |
1150 | * 1 RX queue and/or 2 TX queues. */ | ||
1151 | static int efx_wanted_channels(void) | ||
1152 | { | 1150 | { |
1153 | cpumask_var_t core_mask; | 1151 | cpumask_var_t core_mask; |
1154 | int count; | 1152 | int count; |
@@ -1211,7 +1209,7 @@ static int efx_probe_interrupts(struct efx_nic *efx) | |||
1211 | struct msix_entry xentries[EFX_MAX_CHANNELS]; | 1209 | struct msix_entry xentries[EFX_MAX_CHANNELS]; |
1212 | int n_channels; | 1210 | int n_channels; |
1213 | 1211 | ||
1214 | n_channels = efx_wanted_channels(); | 1212 | n_channels = efx_wanted_parallelism(); |
1215 | if (separate_tx_channels) | 1213 | if (separate_tx_channels) |
1216 | n_channels *= 2; | 1214 | n_channels *= 2; |
1217 | n_channels = min(n_channels, max_channels); | 1215 | n_channels = min(n_channels, max_channels); |