From 363e67d01abad865ba99c19836a30f5ef7ab9122 Mon Sep 17 00:00:00 2001
From: Ben Hutchings <bhutchings@solarflare.com>
Date: Wed, 12 Jan 2011 19:11:05 +0000
Subject: [PATCH] --- yaml --- r: 231229 b: refs/heads/master c:
 5b874e25c5c84bc45fc205407286fbe4744f4776 h: refs/heads/master i:   231227:
 cef6a6153a04815f0c68d03ef1812dfdf977d774 v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/net/sfc/efx.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 7b9955fb2211..8537b27390f8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 976534319b0823aae29237d02e29a32ebcd5f910
+refs/heads/master: 5b874e25c5c84bc45fc205407286fbe4744f4776
diff --git a/trunk/drivers/net/sfc/efx.c b/trunk/drivers/net/sfc/efx.c
index c2dc9a525dea..002bac743843 100644
--- a/trunk/drivers/net/sfc/efx.c
+++ b/trunk/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");