lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[SCSI] qla2xxx: Correctly set the firmware NOS/OLS timeout during initialization.

Browse Source 
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>
This commit is contained in:
Andrew Vasquez
2006-06-23 16:11:27 -07:00
committed by James Bottomley
parent 7ee6139709
commit 3ea66e28c2
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/scsi/qla2xxx/qla_fw.h
View File

@@ -278,7 +278,7 @@ struct init_cb_24xx {
uint16_t response_q_length; uint16_t response_q_length;
uint16_t request_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; uint16_t prio_request_q_length;

3
drivers/scsi/qla2xxx/qla_init.c
View File

@@ -3379,7 +3379,6 @@ qla24xx_nvram_config(scsi_qla_host_t *ha)
nv->node_name[6] = 0x55; nv->node_name[6] = 0x55;
nv->node_name[7] = 0x86; nv->node_name[7] = 0x86;
nv->login_retry_count = __constant_cpu_to_le16(8); 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->interrupt_delay_timer = __constant_cpu_to_le16(0);
nv->login_timeout = __constant_cpu_to_le16(0); nv->login_timeout = __constant_cpu_to_le16(0);
nv->firmware_options_1 = nv->firmware_options_1 =
@@ -3408,7 +3407,7 @@ qla24xx_nvram_config(scsi_qla_host_t *ha)
*dptr1++ = *dptr2++; *dptr1++ = *dptr2++;
icb->login_retry_count = nv->login_retry_count; 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. */ /* Copy 2nd segment. */
dptr1 = (uint8_t *)&icb->interrupt_delay_timer; dptr1 = (uint8_t *)&icb->interrupt_delay_timer;