2 files changed, 0 insertions, 4 deletions

diff --git a/drivers/scsi/qla4xxx/ql4_def.h b/drivers/scsi/qla4xxx/ql4_def.h
index b46d0dc9a48e..7aa60ee485e1 100644
--- a/drivers/scsi/qla4xxx/ql4_def.h
+++ b/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/drivers/scsi/qla4xxx/ql4_init.c b/drivers/scsi/qla4xxx/ql4_init.c
index bf1c30b17a82..8b5453a60444 100644
--- a/drivers/scsi/qla4xxx/ql4_init.c
+++ b/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