diff options
| author | Ben Hutchings <bhutchings@solarflare.com> | 2011-01-12 19:11:05 +0000 |
|---|---|---|
| committer | Ben Hutchings <bhutchings@solarflare.com> | 2011-01-13 22:09:17 +0000 |
| commit | 5b874e25c5c84bc45fc205407286fbe4744f4776 (patch) | |
| tree | b8e0f02cc7295b583fc6d72a4064ab4b9cede720 /drivers/net | |
| parent | 976534319b0823aae29237d02e29a32ebcd5f910 (diff) | |
| download | blackbird-op-linux-5b874e25c5c84bc45fc205407286fbe4744f4776.tar.gz blackbird-op-linux-5b874e25c5c84bc45fc205407286fbe4744f4776.zip | |
sfc: Restore the effect of the rss_cpus module parameter
Commit a4900ac ("sfc: Create multiple TX queues") accidentally
disabled the rss_cpus module parameter.
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/sfc/efx.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/sfc/efx.c b/drivers/net/sfc/efx.c index c2dc9a525dea..002bac743843 100644 --- a/drivers/net/sfc/efx.c +++ b/drivers/net/sfc/efx.c @@ -1153,6 +1153,9 @@ static int efx_wanted_channels(void) int count; int cpu; + if (rss_cpus) + return rss_cpus; + if (unlikely(!zalloc_cpumask_var(&core_mask, GFP_KERNEL))) { printk(KERN_WARNING "sfc: RSS disabled due to allocation failure\n"); |
