]> err.no Git - linux-2.6/commitdiff
[SCSI] qla2xxx: Correctly set the firmware NOS/OLS timeout during initialization.
authorAndrew Vasquez <andrew.vasquez@qlogic.com>
Fri, 23 Jun 2006 23:11:27 +0000 (16:11 -0700)
committerJames Bottomley <jejb@mulgrave.il.steeleye.com>
Mon, 26 Jun 2006 21:25:34 +0000 (16:25 -0500)
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>
drivers/scsi/qla2xxx/qla_fw.h
drivers/scsi/qla2xxx/qla_init.c

index af023f51fe7677a4f87e9f5ad7f37eba34eeec34..a0a722cf423769fb8fd152eaeff5aa140a9ccdb3 100644 (file)
@@ -278,7 +278,7 @@ struct init_cb_24xx {
        uint16_t response_q_length;
        uint16_t request_q_length;
 
-       uint16_t link_down_timeout;             /* Milliseconds. */
+       uint16_t link_down_on_nos;              /* Milliseconds. */
 
        uint16_t prio_request_q_length;
 
index c7ab66877fb72da47c382ec786f99ab8f6b606f2..ce32322f1e19ae095a7e52c0a09f2b8529d6caf9 100644 (file)
@@ -3379,7 +3379,6 @@ qla24xx_nvram_config(scsi_qla_host_t *ha)
                nv->node_name[6] = 0x55;
                nv->node_name[7] = 0x86;
                nv->login_retry_count = __constant_cpu_to_le16(8);
-               nv->link_down_timeout = __constant_cpu_to_le16(200);
                nv->interrupt_delay_timer = __constant_cpu_to_le16(0);
                nv->login_timeout = __constant_cpu_to_le16(0);
                nv->firmware_options_1 =
@@ -3408,7 +3407,7 @@ qla24xx_nvram_config(scsi_qla_host_t *ha)
                *dptr1++ = *dptr2++;
 
        icb->login_retry_count = nv->login_retry_count;
-       icb->link_down_timeout = nv->link_down_timeout;
+       icb->link_down_on_nos = nv->link_down_on_nos;
 
        /* Copy 2nd segment. */
        dptr1 = (uint8_t *)&icb->interrupt_delay_timer;