---

yaml --- r: 231229 b: refs/heads/master c: 5b874e2 h: refs/heads/master i: 231227: cef6a61 v: v3
git-mirror · Jan 13, 2011 · 363e67d · 363e67d
1 parent 1a7f752
commit 363e67d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git 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
@@ -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");