From: Ben Hutchings <bhutchings@solarflare.com>
Date: Wed, 12 Jan 2011 19:11:05 +0000 (+0000)
Subject: sfc: Restore the effect of the rss_cpus module parameter
X-Git-Tag: v2.6.38-rc1~50^2~8^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5b874e25c5c84bc45fc205407286fbe4744f4776;p=platform%2Fkernel%2Flinux-stable.git

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>
---

diff --git a/drivers/net/sfc/efx.c b/drivers/net/sfc/efx.c
index c2dc9a5..002bac7 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");