[SCSI] qla4xxx: do not reset hba if ql4xdontresethba is set

Signed-off-by: Vikas Chaudhary <vikas.chaudhary@qlogic.com>
Signed-off-by: Ravi Anand <ravi.anand@qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>

diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c
index a1ba085565af52c21350612ad14a6952ad4aa2ed..3cb74c9269a440f022b3e91a4ed3e5a9c5ddffbe 100644 (file)
--- a/drivers/scsi/qla4xxx/ql4_os.c
+++ b/drivers/scsi/qla4xxx/ql4_os.c
@@ -711,15 +711,17 @@ void qla4_8xxx_watchdog(struct scsi_qla_host *ha)
            test_bit(DPC_RESET_ACTIVE, &ha->dpc_flags))) {
                if (dev_state == QLA82XX_DEV_NEED_RESET &&
                    !test_bit(DPC_RESET_HA, &ha->dpc_flags)) {
-                       printk("scsi%ld: %s: HW State: NEED RESET!\n",
-                           ha->host_no, __func__);
-                       set_bit(DPC_RESET_HA, &ha->dpc_flags);
-                       qla4xxx_wake_dpc(ha);
-                       qla4xxx_mailbox_premature_completion(ha);
+                       if (!ql4xdontresethba) {
+                               ql4_printk(KERN_INFO, ha, "%s: HW State: "
+                                   "NEED RESET!\n", __func__);
+                               set_bit(DPC_RESET_HA, &ha->dpc_flags);
+                               qla4xxx_wake_dpc(ha);
+                               qla4xxx_mailbox_premature_completion(ha);
+                       }
                } else if (dev_state == QLA82XX_DEV_NEED_QUIESCENT &&
                    !test_bit(DPC_HA_NEED_QUIESCENT, &ha->dpc_flags)) {
-                       printk("scsi%ld: %s: HW State: NEED QUIES!\n",
-                           ha->host_no, __func__);
+                       ql4_printk(KERN_INFO, ha, "%s: HW State: NEED QUIES!\n",
+                           __func__);
                        set_bit(DPC_HA_NEED_QUIESCENT, &ha->dpc_flags);
                        qla4xxx_wake_dpc(ha);
                } else  {