From: Saurav Kashyap <saurav.kashyap@qlogic.com>
Date: Thu, 2 Aug 2012 06:04:17 +0000 (+0530)
Subject: qla2xxx: Restrict nic core reset to one function for mctp.
X-Git-Tag: v2.6.39-400.9.0~401
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=e1325660d362d3da77dcc5a0a18b9acfe7330a60;p=users%2Fjedix%2Flinux-maple.git

qla2xxx: Restrict nic core reset to one function for mctp.

In case of mctp enable board both functions receive 8200 AEN, both captures
the dump and both ends up restarting the nic core. This patch prevents allow
only function to perform nic core reset.

JIRA Key: V2632FC-251

ER: ER96691

Acked-by: Giridhar Malavali <giridhar.malavali@qlogic.com>
---

diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index 9d16f9ffc0f2..cf68960e4786 100644
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -4117,7 +4117,7 @@ qla2xxx_mctp_dump(scsi_qla_host_t *vha)
 		ha->mctp_dumped = 1;
 	}
 
-        if (!ha->flags.nic_core_reset_hdlr_active) {
+        if (!ha->flags.nic_core_reset_hdlr_active && !ha->portnum) {
                 ha->flags.nic_core_reset_hdlr_active = 1;
                 if ((rval = qla83xx_restart_nic_firmware(vha)))
                         /* NIC Core reset failed. */