From: root <root@localhost.localdomain>
Date: Wed, 2 May 2012 14:13:21 +0000 (+0530)
Subject: be2iscsi:Set num_cpu = 1 if pci_enable_msix fails
X-Git-Tag: v2.6.39-400.9.0~423^2~53
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=5465872e0b0bee5d6aab31ddcd8f3e8253edfaf8;p=users%2Fjedix%2Flinux-maple.git

be2iscsi:Set num_cpu = 1 if pci_enable_msix fails

 This patch sets the num_cpu to 1 if  msix not supported
 Signed-off-by: Jayamohan Kallickal <jayamohan.kallickal@emulex.com>
 Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: root <root@localhost.(none)>
---

diff --git a/drivers/scsi/be2iscsi/be_main.c b/drivers/scsi/be2iscsi/be_main.c
index ccf92fc20570f..47a9e871feb68 100644
--- a/drivers/scsi/be2iscsi/be_main.c
+++ b/drivers/scsi/be2iscsi/be_main.c
@@ -4281,8 +4281,11 @@ static int __devinit beiscsi_dev_probe(struct pci_dev *pcidev,
 	phba->num_cpus = num_cpus;
 	SE_DEBUG(DBG_LVL_8, "num_cpus = %d\n", phba->num_cpus);
 
-	if (enable_msix)
+	if (enable_msix) {
 		beiscsi_msix_enable(phba);
+		if (!phba->msix_enabled)
+			phba->num_cpus = 1;
+	}
 	ret = be_ctrl_init(phba, pcidev);
 	if (ret) {
 		shost_printk(KERN_ERR, phba->shost, "beiscsi_dev_probe-"