Commit 15d1f53f authored Sep 25, 2006 by Jes Sorensen Committed by James Bottomley Sep 26, 2006

[SCSI] qla1280 command timeout

Original patch from Ian Dall in bugzilla. Set command timeout as
specified by the SCSI layer rather than hardcode it to 30 seconds. I
have received a couple of reports of people hitting this one with
various tape configurations and the patch looks obviously correct.
                                                                  - Jes

From http://bugzilla.kernel.org/show_bug.cgi?id=6275



ian@beware.dropbear.id.au (Ian Dall):

The command sent to the card was using a 30second timeout regardless of the
timeout requested in the scsi command passed down from higher levels.

Signed-off-by: Jes Sorensen <jes@sgi.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

parent bc54ec6b

drivers/scsi/qla1280.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -2862,7 +2862,7 @@ qla1280_64bit_start_scsi(struct scsi_qla_host ha, struct srb sp)
		memset(((char *)pkt + 8), 0, (REQUEST_ENTRY_SIZE - 8));

		/* Set ISP command timeout. */
		pkt->timeout = cpu_to_le16(30);
		pkt->timeout = cpu_to_le16(cmd->timeout_per_command/HZ);

		/* Set device target ID and LUN */
		pkt->lun = SCSI_LUN_32(cmd);
		@@ -3161,7 +3161,7 @@ qla1280_32bit_start_scsi(struct scsi_qla_host ha, struct srb sp)
		memset(((char *)pkt + 8), 0, (REQUEST_ENTRY_SIZE - 8));

		/* Set ISP command timeout. */
		pkt->timeout = cpu_to_le16(30);
		pkt->timeout = cpu_to_le16(cmd->timeout_per_command/HZ);

		/* Set device target ID and LUN */
		pkt->lun = SCSI_LUN_32(cmd);

Admin message