Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3ea66e28 authored by Andrew Vasquez's avatar Andrew Vasquez Committed by James Bottomley
Browse files

[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: default avatarAndrew Vasquez <andrew.vasquez@qlogic.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent 7ee61397

drivers/scsi/qla2xxx/qla_fw.h

+1 −1
Original line number Diff line number Diff line
@@ -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;

drivers/scsi/qla2xxx/qla_init.c

+1 −2
Original line number Diff line number Diff line
@@ -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;