From 4bbac5bbd27817732ee1777014dfe6759b48ac57 Mon Sep 17 00:00:00 2001
From: Sucheta Chakraborty <sucheta.chakraborty@qlogic.com>
Date: Wed, 22 Jun 2011 02:52:20 +0000
Subject: [PATCH] --- yaml --- r: 255683 b: refs/heads/master c:
 5f6ec29abe434676f940357bcd66536bbc69e9f8 h: refs/heads/master i:   255681:
 debae53e22d2faa71a3986e56027fd02a7def342   255679:
 b2aaf3bbeeaa74645fa41f4707a83d7dfeb18556 v: v3

---
 [refs]                                 | 2 +-
 trunk/drivers/net/qlcnic/qlcnic.h      | 1 -
 trunk/drivers/net/qlcnic/qlcnic_main.c | 6 ++----
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index cb0b24bf1d23..26a4c26ba66f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c40f4ef77e5123a1d4064d7a34f708483b32b8be
+refs/heads/master: 5f6ec29abe434676f940357bcd66536bbc69e9f8
diff --git a/trunk/drivers/net/qlcnic/qlcnic.h b/trunk/drivers/net/qlcnic/qlcnic.h
index e5bb33253f94..58d7616eaee2 100644
--- a/trunk/drivers/net/qlcnic/qlcnic.h
+++ b/trunk/drivers/net/qlcnic/qlcnic.h
@@ -900,7 +900,6 @@ struct qlcnic_ipaddr {
 	((adapter)->flags & (QLCNIC_MSI_ENABLED | QLCNIC_MSIX_ENABLED))
 
 #define QLCNIC_DEF_NUM_STS_DESC_RINGS	4
-#define QLCNIC_MIN_NUM_RSS_RINGS	2
 #define QLCNIC_MSIX_TBL_SPACE		8192
 #define QLCNIC_PCI_REG_MSIX_TBL 	0x44
 #define QLCNIC_MSIX_TBL_PGSIZE		4096
diff --git a/trunk/drivers/net/qlcnic/qlcnic_main.c b/trunk/drivers/net/qlcnic/qlcnic_main.c
index a656a12e24d1..a050746a5129 100644
--- a/trunk/drivers/net/qlcnic/qlcnic_main.c
+++ b/trunk/drivers/net/qlcnic/qlcnic_main.c
@@ -418,10 +418,8 @@ qlcnic_setup_intr(struct qlcnic_adapter *adapter)
 	int num_msix;
 
 	if (adapter->msix_supported) {
-		num_msix = (num_online_cpus() >=
-			QLCNIC_DEF_NUM_STS_DESC_RINGS) ?
-			QLCNIC_DEF_NUM_STS_DESC_RINGS :
-			QLCNIC_MIN_NUM_RSS_RINGS;
+		num_msix = rounddown_pow_of_two(min_t(int, num_online_cpus(),
+				QLCNIC_DEF_NUM_STS_DESC_RINGS));
 	} else
 		num_msix = 1;