aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi
diff options
context:
space:
mode:
authorRavi Anand <ravi.anand@qlogic.com>2007-09-20 14:07:40 -0700
committerJames Bottomley <jejb@mulgrave.localdomain>2007-10-12 14:50:02 -0400
commit63a8651f2548c6bb5132c0b4e7dad4f57a9274db (patch)
tree721db8f23a2a9ea20fd029dde2e2ed5bb23d6792 /drivers/scsi
parent[SCSI] qla2xxx: Query additional RISC registers during ISP25XX firmware dump. (diff)
downloadlinux-dev-63a8651f2548c6bb5132c0b4e7dad4f57a9274db.tar.xz
linux-dev-63a8651f2548c6bb5132c0b4e7dad4f57a9274db.zip
[SCSI] qla2xxx: Correct infinite-login-retry issue.
Where the DPC logic would get jammed into continuously reloging-into a port. Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/scsi')
-rw-r--r--drivers/scsi/qla2xxx/qla_os.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index a8ab2d3447ba..4314f94bd477 100644
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -2437,7 +2437,6 @@ qla2x00_do_dpc(void *data)
if (atomic_read(&fcport->state) != FCS_ONLINE &&
fcport->login_retry) {
- fcport->login_retry--;
if (fcport->flags & FCF_FABRIC_DEVICE) {
if (fcport->flags &
FCF_TAPE_PRESENT)
@@ -2453,6 +2452,7 @@ qla2x00_do_dpc(void *data)
qla2x00_local_device_login(
ha, fcport);
+ fcport->login_retry--;
if (status == QLA_SUCCESS) {
fcport->old_loop_id = fcport->loop_id;
@@ -2470,6 +2470,8 @@ qla2x00_do_dpc(void *data)
} else {
fcport->login_retry = 0;
}
+ if (fcport->login_retry == 0)
+ fcport->loop_id = FC_NO_LOOP_ID;
}
if (test_bit(LOOP_RESYNC_NEEDED, &ha->dpc_flags))
break;