patch-2.2.14 linux/drivers/scsi/qlogicfc.c

• Lines: 29
• Date: Tue Jan 4 10:12:20 2000
• Orig file: v2.2.13/linux/drivers/scsi/qlogicfc.c
• Orig date: Tue Jan 4 11:10:38 2000

diff -u --recursive --new-file v2.2.13/linux/drivers/scsi/qlogicfc.c linux/drivers/scsi/qlogicfc.c
@@ -758,7 +758,7 @@
 			hostdata->control_block.firm_opts = 0x0108;
 			hostdata->control_block.max_frame_len = 2048;
 			hostdata->control_block.max_iocb = 256;
-			hostdata->control_block.exec_throttle = 8;
+			hostdata->control_block.exec_throttle = QLOGICFC_CMD_PER_LUN;
 			hostdata->control_block.retry_delay = 5;
 			hostdata->control_block.retry_cnt = 1;
 			hostdata->control_block.node_name[0] = 0x0020;
@@ -1287,8 +1287,9 @@
 		/* scsi.c expects sense info in a different buffer */
 		cmd->dataseg[0].d_base = virt_to_bus_low32(Cmnd->sense_buffer);
 #if BITS_PER_LONG > 32
-		cmd->dataseg[0].d_base_hi = virt_to_bus_high32(Cmnd->request_buffer);
+		cmd->dataseg[0].d_base_hi = virt_to_bus_high32(Cmnd->sense_buffer);
 #endif
+		cmd->dataseg[0].d_count = sizeof(Cmnd->sense_buffer);
 		cmd->segment_cnt = 1;
 		cmd->control_flags = CFLAG_READ;
 		break;
@@ -1855,7 +1856,7 @@
 
 static int isp2x00_init(struct Scsi_Host *sh)
 {
-	u_int io_base;
+	u_long io_base;
 	struct isp2x00_hostdata *hostdata;
 	u_char revision;
 	u_int irq;