aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/qla4xxx/ql4_def.h
diff options
context:
space:
mode:
authorVikas Chaudhary <vikas.chaudhary@qlogic.com>2010-07-30 04:55:46 -0400
committerJames Bottomley <James.Bottomley@suse.de>2010-08-06 12:56:04 -0400
commit3013cea83ef3532e49b973a0bc9b3562f56871c6 (patch)
tree14371e9c379b1fb1fa31e7568ade52f203c73cf8 /drivers/scsi/qla4xxx/ql4_def.h
parentbe948fc30dabc347e4fba4daf4da9fd83d2abf49 (diff)
[SCSI] qla4xxx: set correct value in sess->recovery_tmo
Signed-off-by: Vikas Chaudhary <vikas.chaudhary@qlogic.com> Signed-off-by: Ravi Anand <ravi.anand@qlogic.com> Reviewed-by: Mike Christie <michaelc@cs.wisc.edu> Signed-off-by: James Bottomley <James.Bottomley@suse.de>
Diffstat (limited to 'drivers/scsi/qla4xxx/ql4_def.h')
-rw-r--r--drivers/scsi/qla4xxx/ql4_def.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/scsi/qla4xxx/ql4_def.h b/drivers/scsi/qla4xxx/ql4_def.h
index a79da8dd2064..6af5d04c5290 100644
--- a/drivers/scsi/qla4xxx/ql4_def.h
+++ b/drivers/scsi/qla4xxx/ql4_def.h
@@ -137,6 +137,9 @@
137#define ISCSI_ALIAS_SIZE 32 /* ISCSI Alias name size */ 137#define ISCSI_ALIAS_SIZE 32 /* ISCSI Alias name size */
138#define ISCSI_NAME_SIZE 0xE0 /* ISCSI Name size */ 138#define ISCSI_NAME_SIZE 0xE0 /* ISCSI Name size */
139 139
140#define QL4_SESS_RECOVERY_TMO 30 /* iSCSI session */
141 /* recovery timeout */
142
140#define LSDW(x) ((u32)((u64)(x))) 143#define LSDW(x) ((u32)((u64)(x)))
141#define MSDW(x) ((u32)((((u64)(x)) >> 16) >> 16)) 144#define MSDW(x) ((u32)((((u64)(x)) >> 16) >> 16))
142 145
@@ -249,7 +252,6 @@ struct ddb_entry {
249 uint32_t default_time2wait; /* Default Min time between 252 uint32_t default_time2wait; /* Default Min time between
250 * relogins (+aens) */ 253 * relogins (+aens) */
251 254
252 atomic_t port_down_timer; /* Device connection timer */
253 atomic_t retry_relogin_timer; /* Min Time between relogins 255 atomic_t retry_relogin_timer; /* Min Time between relogins
254 * (4000 only) */ 256 * (4000 only) */
255 atomic_t relogin_timer; /* Max Time to wait for relogin to complete */ 257 atomic_t relogin_timer; /* Max Time to wait for relogin to complete */
@@ -474,7 +476,6 @@ struct scsi_qla_host {
474 uint32_t timer_active; 476 uint32_t timer_active;
475 477
476 /* Recovery Timers */ 478 /* Recovery Timers */
477 uint32_t port_down_retry_count;
478 uint32_t discovery_wait; 479 uint32_t discovery_wait;
479 atomic_t check_relogin_timeouts; 480 atomic_t check_relogin_timeouts;
480 uint32_t retry_reset_ha_cnt; 481 uint32_t retry_reset_ha_cnt;