From a52f5a2a2c6a8d333f5b9328e3233754e5d52216 Mon Sep 17 00:00:00 2001 From: Vikas Chaudhary Date: Mon, 21 Mar 2011 03:34:28 -0700 Subject: [PATCH] --- yaml --- r: 242713 b: refs/heads/master c: 58da51dcfc13b2222ce8565e308852aef001f5d2 h: refs/heads/master i: 242711: 6cf03d9e1f16952b5c8c1dc073d82e223a600365 v: v3 --- [refs] | 2 +- trunk/drivers/scsi/qla4xxx/ql4_def.h | 2 -- trunk/drivers/scsi/qla4xxx/ql4_init.c | 2 -- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/[refs] b/[refs] index cd9cbf981f17..2a810c2caf15 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7edd9a7b28f57d8a5bcdb1a0def2aa09d1dd49d4 +refs/heads/master: 58da51dcfc13b2222ce8565e308852aef001f5d2 diff --git a/trunk/drivers/scsi/qla4xxx/ql4_def.h b/trunk/drivers/scsi/qla4xxx/ql4_def.h index b46d0dc9a48e..7aa60ee485e1 100644 --- a/trunk/drivers/scsi/qla4xxx/ql4_def.h +++ b/trunk/drivers/scsi/qla4xxx/ql4_def.h @@ -286,8 +286,6 @@ struct ddb_entry { * DDB flags. */ #define DF_RELOGIN 0 /* Relogin to device */ -#define DF_NO_RELOGIN 1 /* Do not relogin if IOCTL - * logged it out */ #define DF_ISNS_DISCOVERED 2 /* Device was discovered via iSNS */ #define DF_FO_MASKED 3 diff --git a/trunk/drivers/scsi/qla4xxx/ql4_init.c b/trunk/drivers/scsi/qla4xxx/ql4_init.c index bf1c30b17a82..8b5453a60444 100644 --- a/trunk/drivers/scsi/qla4xxx/ql4_init.c +++ b/trunk/drivers/scsi/qla4xxx/ql4_init.c @@ -1445,7 +1445,6 @@ int qla4xxx_process_ddb_changed(struct scsi_qla_host *ha, uint32_t fw_ddb_index, atomic_set(&ddb_entry->relogin_retry_count, 0); atomic_set(&ddb_entry->relogin_timer, 0); clear_bit(DF_RELOGIN, &ddb_entry->flags); - clear_bit(DF_NO_RELOGIN, &ddb_entry->flags); iscsi_unblock_session(ddb_entry->sess); iscsi_session_event(ddb_entry->sess, ISCSI_KEVENT_CREATE_SESSION); @@ -1470,7 +1469,6 @@ int qla4xxx_process_ddb_changed(struct scsi_qla_host *ha, uint32_t fw_ddb_index, */ if (ddb_entry->fw_ddb_device_state == DDB_DS_SESSION_FAILED && !test_bit(DF_RELOGIN, &ddb_entry->flags) && - !test_bit(DF_NO_RELOGIN, &ddb_entry->flags) && qla4_is_relogin_allowed(ha, conn_err)) { /* * This triggers a relogin. After the relogin_timer