From 6b4e88b712d685a44fe28d316cb21d8df07b2054 Mon Sep 17 00:00:00 2001 From: Jes Sorensen Date: Mon, 25 Sep 2006 05:44:57 -0400 Subject: [PATCH] --- yaml --- r: 38935 b: refs/heads/master c: 15d1f53fc7654d62af7e9b23049ae3b71f5b161c h: refs/heads/master i: 38933: 51e8595f7cf33e2eddef18cb1130cbebaae6b550 38931: a70de7ce9f92fd9b27a985c59216dbc6841d8432 38927: de5c1b390adde757f09198498b28b800b0d1f236 v: v3 --- [refs] | 2 +- trunk/drivers/scsi/qla1280.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index a07eb48cb766..88e43e14329b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bc54ec6b0782979a440603beeed349b2eac39a59 +refs/heads/master: 15d1f53fc7654d62af7e9b23049ae3b71f5b161c diff --git a/trunk/drivers/scsi/qla1280.c b/trunk/drivers/scsi/qla1280.c index 8953991462d7..2747c8e02f83 100644 --- a/trunk/drivers/scsi/qla1280.c +++ b/trunk/drivers/scsi/qla1280.c @@ -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);