aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/qla2xxx/qla_init.c
diff options
context:
space:
mode:
authorAndrew Vasquez <andrew.vasquez@qlogic.com>2006-06-23 19:11:27 -0400
committerJames Bottomley <jejb@mulgrave.il.steeleye.com>2006-06-26 17:25:34 -0400
commit3ea66e28c20e3b23749c9001c58b37ad44263442 (patch)
treeec6c2874af2e24ff9289ba845fff1a866eb12f07 /drivers/scsi/qla2xxx/qla_init.c
parent7ee613970947bdf5f722bb01547c97f4fc80fe9f (diff)
[SCSI] qla2xxx: Correctly set the firmware NOS/OLS timeout during initialization.
Original code incorrectly assigned it to the driver's link-down-timeout value (a value in seconds). Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/scsi/qla2xxx/qla_init.c')
-rw-r--r--drivers/scsi/qla2xxx/qla_init.c3
1 files changed, 1 insertions, 2 deletions
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;