From f7a46284f4e35d8845181f790363085b1aea02cc Mon Sep 17 00:00:00 2001
From: Ravi Anand <ravi.anand@qlogic.com>
Date: Thu, 20 Sep 2007 14:07:40 -0700
Subject: [PATCH] --- yaml --- r: 68912 b: refs/heads/master c:
 63a8651f2548c6bb5132c0b4e7dad4f57a9274db h: refs/heads/master v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/scsi/qla2xxx/qla_os.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 26ad81331d36..515d562c6a43 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b58369273956775c3e8b7bbbe152593d52762099
+refs/heads/master: 63a8651f2548c6bb5132c0b4e7dad4f57a9274db
diff --git a/trunk/drivers/scsi/qla2xxx/qla_os.c b/trunk/drivers/scsi/qla2xxx/qla_os.c
index a8ab2d3447ba..4314f94bd477 100644
--- a/trunk/drivers/scsi/qla2xxx/qla_os.c
+++ b/trunk/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;