qlcnic: fix initial number of msix entries in adapter.

Calculation of number of MSI-X vectors was wrong on uniprocessor
systems.

Signed-off-by: Sucheta Chakraborty <sucheta.chakraborty@qlogic.com>
Signed-off-by: Anirban Chakraborty <anirban.chakraborty@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

2 files changed, 2 insertions, 5 deletions

diff --git a/drivers/net/qlcnic/qlcnic.h b/drivers/net/qlcnic/qlcnic.h
index e5bb33253f9..58d7616eaee 100644
--- a/drivers/net/qlcnic/qlcnic.h
+++ b/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/drivers/net/qlcnic/qlcnic_main.c b/drivers/net/qlcnic/qlcnic_main.c
index a656a12e24d..a050746a512 100644
--- a/drivers/net/qlcnic/qlcnic_main.c
+++ b/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;