diff options
author | Ben Hutchings <bhutchings@solarflare.com> | 2011-01-12 14:11:05 -0500 |
---|---|---|
committer | Ben Hutchings <bhutchings@solarflare.com> | 2011-01-13 17:09:17 -0500 |
commit | 5b874e25c5c84bc45fc205407286fbe4744f4776 (patch) | |
tree | b8e0f02cc7295b583fc6d72a4064ab4b9cede720 | |
parent | 976534319b0823aae29237d02e29a32ebcd5f910 (diff) |
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>
-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) | |||
1153 | int count; | 1153 | int count; |
1154 | int cpu; | 1154 | int cpu; |
1155 | 1155 | ||
1156 | if (rss_cpus) | ||
1157 | return rss_cpus; | ||
1158 | |||
1156 | if (unlikely(!zalloc_cpumask_var(&core_mask, GFP_KERNEL))) { | 1159 | if (unlikely(!zalloc_cpumask_var(&core_mask, GFP_KERNEL))) { |
1157 | printk(KERN_WARNING | 1160 | printk(KERN_WARNING |
1158 | "sfc: RSS disabled due to allocation failure\n"); | 1161 | "sfc: RSS disabled due to allocation failure\n"); |