---

yaml --- r: 314991 b: refs/heads/master c: 7d51541 h: refs/heads/master i: 314989: c254547 314987: af8d37f 314983: 65cd496 314975: b2284f5 v: v3
git-mirror · Jul 5, 2012 · 46df32f · 46df32f
1 parent 03eb7ed
commit 46df32f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0a742128db29031e55d27e37b1b098433c56033a
+refs/heads/master: 7d515413557907078e805ee7fd6f3920bc33762d
diff --git a/trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h b/trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
@@ -822,7 +822,8 @@ static inline int bnx2x_calc_num_queues(struct bnx2x *bp)
 {
 	return  num_queues ?
 		 min_t(int, num_queues, BNX2X_MAX_QUEUES(bp)) :
-		 min_t(int, num_online_cpus(), BNX2X_MAX_QUEUES(bp));
+		 min_t(int, netif_get_num_default_rss_queues(),
+		       BNX2X_MAX_QUEUES(bp));
 }
 
 static inline void bnx2x_clear_sge_mask_next_elems(struct bnx2x_fastpath *fp)