aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVikas Chaudhary <vikas.chaudhary@qlogic.com>2011-03-21 06:34:28 -0400
committerJames Bottomley <James.Bottomley@suse.de>2011-03-23 13:53:00 -0400
commit58da51dcfc13b2222ce8565e308852aef001f5d2 (patch)
treea0b81760dedad6852362e34c875d2276737b960f
parent7edd9a7b28f57d8a5bcdb1a0def2aa09d1dd49d4 (diff)
[SCSI] qla4xxx: remove unused ddb flag DF_NO_RELOGIN
Signed-off-by: Vikas Chaudhary <vikas.chaudhary@qlogic.com> Reviewed-by: Mike Christie <michaelc@cs.wisc.edu> Signed-off-by: James Bottomley <James.Bottomley@suse.de>
-rw-r--r--drivers/scsi/qla4xxx/ql4_def.h2
-rw-r--r--drivers/scsi/qla4xxx/ql4_init.c2
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 {
286 * DDB flags. 286 * DDB flags.
287 */ 287 */
288#define DF_RELOGIN 0 /* Relogin to device */ 288#define DF_RELOGIN 0 /* Relogin to device */
289#define DF_NO_RELOGIN 1 /* Do not relogin if IOCTL
290 * logged it out */
291#define DF_ISNS_DISCOVERED 2 /* Device was discovered via iSNS */ 289#define DF_ISNS_DISCOVERED 2 /* Device was discovered via iSNS */
292#define DF_FO_MASKED 3 290#define DF_FO_MASKED 3
293 291
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,
1445 atomic_set(&ddb_entry->relogin_retry_count, 0); 1445 atomic_set(&ddb_entry->relogin_retry_count, 0);
1446 atomic_set(&ddb_entry->relogin_timer, 0); 1446 atomic_set(&ddb_entry->relogin_timer, 0);
1447 clear_bit(DF_RELOGIN, &ddb_entry->flags); 1447 clear_bit(DF_RELOGIN, &ddb_entry->flags);
1448 clear_bit(DF_NO_RELOGIN, &ddb_entry->flags);
1449 iscsi_unblock_session(ddb_entry->sess); 1448 iscsi_unblock_session(ddb_entry->sess);
1450 iscsi_session_event(ddb_entry->sess, 1449 iscsi_session_event(ddb_entry->sess,
1451 ISCSI_KEVENT_CREATE_SESSION); 1450 ISCSI_KEVENT_CREATE_SESSION);
@@ -1470,7 +1469,6 @@ int qla4xxx_process_ddb_changed(struct scsi_qla_host *ha, uint32_t fw_ddb_index,
1470 */ 1469 */
1471 if (ddb_entry->fw_ddb_device_state == DDB_DS_SESSION_FAILED && 1470 if (ddb_entry->fw_ddb_device_state == DDB_DS_SESSION_FAILED &&
1472 !test_bit(DF_RELOGIN, &ddb_entry->flags) && 1471 !test_bit(DF_RELOGIN, &ddb_entry->flags) &&
1473 !test_bit(DF_NO_RELOGIN, &ddb_entry->flags) &&
1474 qla4_is_relogin_allowed(ha, conn_err)) { 1472 qla4_is_relogin_allowed(ha, conn_err)) {
1475 /* 1473 /*
1476 * This triggers a relogin. After the relogin_timer 1474 * This triggers a relogin. After the relogin_timer