summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLalit Chandivade <lalit.chandivade@qlogic.com>2010-09-03 23:57:02 +0200
committerJames Bottomley <James.Bottomley@suse.de>2010-09-05 20:18:28 +0200
commitefa786cc43a114d0bf2e4b95e856ea6911404d58 (patch)
treecf2ff9e34fc893b0ddf80573d620c67a08181aa0
parent[SCSI] qla2xxx: make rport deletions explicit during vport removal (diff)
downloadlinux-efa786cc43a114d0bf2e4b95e856ea6911404d58.tar.xz
linux-efa786cc43a114d0bf2e4b95e856ea6911404d58.zip
[SCSI] qla2xxx: Reset seconds_since_last_heartbeat correctly.
The seconds_since_last_heartbeat should be checked for consecutive heartbeat checks. Currently it could happen that seconds_since_last_heartbeat gets set to max (2 seconds) for non-consecutive heartbeat checks. Signed-off-by: Giridhar Malavali <giridhar.malavali@qlogic.com> Signed-off-by: James Bottomley <James.Bottomley@suse.de>
-rw-r--r--drivers/scsi/qla2xxx/qla_nx.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/scsi/qla2xxx/qla_nx.c b/drivers/scsi/qla2xxx/qla_nx.c
index 915b77a6e193..e54d2fa1c9f1 100644
--- a/drivers/scsi/qla2xxx/qla_nx.c
+++ b/drivers/scsi/qla2xxx/qla_nx.c
@@ -3316,7 +3316,8 @@ qla82xx_check_fw_alive(scsi_qla_host_t *vha)
complete(&ha->mbx_intr_comp);
}
}
- }
+ } else
+ vha->seconds_since_last_heartbeat = 0;
vha->fw_heartbeat_counter = fw_heartbeat_counter;
}