diff options
-rw-r--r-- | drivers/scsi/qla2xxx/qla_fw.h | 2 | ||||
-rw-r--r-- | drivers/scsi/qla2xxx/qla_init.c | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/drivers/scsi/qla2xxx/qla_fw.h b/drivers/scsi/qla2xxx/qla_fw.h index af023f51fe76..a0a722cf4237 100644 --- a/drivers/scsi/qla2xxx/qla_fw.h +++ b/drivers/scsi/qla2xxx/qla_fw.h | |||
@@ -278,7 +278,7 @@ struct init_cb_24xx { | |||
278 | uint16_t response_q_length; | 278 | uint16_t response_q_length; |
279 | uint16_t request_q_length; | 279 | uint16_t request_q_length; |
280 | 280 | ||
281 | uint16_t link_down_timeout; /* Milliseconds. */ | 281 | uint16_t link_down_on_nos; /* Milliseconds. */ |
282 | 282 | ||
283 | uint16_t prio_request_q_length; | 283 | uint16_t prio_request_q_length; |
284 | 284 | ||
diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c index c7ab66877fb7..ce32322f1e19 100644 --- a/drivers/scsi/qla2xxx/qla_init.c +++ b/drivers/scsi/qla2xxx/qla_init.c | |||
@@ -3379,7 +3379,6 @@ qla24xx_nvram_config(scsi_qla_host_t *ha) | |||
3379 | nv->node_name[6] = 0x55; | 3379 | nv->node_name[6] = 0x55; |
3380 | nv->node_name[7] = 0x86; | 3380 | nv->node_name[7] = 0x86; |
3381 | nv->login_retry_count = __constant_cpu_to_le16(8); | 3381 | nv->login_retry_count = __constant_cpu_to_le16(8); |
3382 | nv->link_down_timeout = __constant_cpu_to_le16(200); | ||
3383 | nv->interrupt_delay_timer = __constant_cpu_to_le16(0); | 3382 | nv->interrupt_delay_timer = __constant_cpu_to_le16(0); |
3384 | nv->login_timeout = __constant_cpu_to_le16(0); | 3383 | nv->login_timeout = __constant_cpu_to_le16(0); |
3385 | nv->firmware_options_1 = | 3384 | nv->firmware_options_1 = |
@@ -3408,7 +3407,7 @@ qla24xx_nvram_config(scsi_qla_host_t *ha) | |||
3408 | *dptr1++ = *dptr2++; | 3407 | *dptr1++ = *dptr2++; |
3409 | 3408 | ||
3410 | icb->login_retry_count = nv->login_retry_count; | 3409 | icb->login_retry_count = nv->login_retry_count; |
3411 | icb->link_down_timeout = nv->link_down_timeout; | 3410 | icb->link_down_on_nos = nv->link_down_on_nos; |
3412 | 3411 | ||
3413 | /* Copy 2nd segment. */ | 3412 | /* Copy 2nd segment. */ |
3414 | dptr1 = (uint8_t *)&icb->interrupt_delay_timer; | 3413 | dptr1 = (uint8_t *)&icb->interrupt_delay_timer; |