diff options
author | Mike Christie <michaelc@cs.wisc.edu> | 2009-04-21 16:32:33 -0400 |
---|---|---|
committer | James Bottomley <James.Bottomley@HansenPartnership.com> | 2009-04-27 11:09:59 -0400 |
commit | dd0af9f94e54efb13ee050ebac11909215ef02c2 (patch) | |
tree | afa6e1ca35b4197221308c14ca80d5da3c691372 /drivers/scsi/cxgb3i | |
parent | 6b5d6c443a9b4fd71b633cef66b5db4de8a85787 (diff) |
[SCSI] cxgb3i: fix can_queue and cmd_per_lun initialization
cxgb3i was setting can_queue to only 128 commands, and was
setting the can_queue and cmd_per_lun to the same value.
This sets the can_queue to 1024 commands, and sets the cmd_per_lun
to a safer default of 32.
Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
Diffstat (limited to 'drivers/scsi/cxgb3i')
-rw-r--r-- | drivers/scsi/cxgb3i/cxgb3i.h | 2 | ||||
-rw-r--r-- | drivers/scsi/cxgb3i/cxgb3i_iscsi.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/scsi/cxgb3i/cxgb3i.h b/drivers/scsi/cxgb3i/cxgb3i.h index d362860e750..59b0958d2d1 100644 --- a/drivers/scsi/cxgb3i/cxgb3i.h +++ b/drivers/scsi/cxgb3i/cxgb3i.h | |||
@@ -34,7 +34,7 @@ | |||
34 | #include "cxgb3i_offload.h" | 34 | #include "cxgb3i_offload.h" |
35 | #include "cxgb3i_ddp.h" | 35 | #include "cxgb3i_ddp.h" |
36 | 36 | ||
37 | #define CXGB3I_SCSI_QDEPTH_DFLT 128 | 37 | #define CXGB3I_SCSI_HOST_QDEPTH 1024 |
38 | #define CXGB3I_MAX_TARGET CXGB3I_MAX_CONN | 38 | #define CXGB3I_MAX_TARGET CXGB3I_MAX_CONN |
39 | #define CXGB3I_MAX_LUN 512 | 39 | #define CXGB3I_MAX_LUN 512 |
40 | #define ISCSI_PDU_NONPAYLOAD_MAX \ | 40 | #define ISCSI_PDU_NONPAYLOAD_MAX \ |
diff --git a/drivers/scsi/cxgb3i/cxgb3i_iscsi.c b/drivers/scsi/cxgb3i/cxgb3i_iscsi.c index b3ca3a05f0d..9212400b9b1 100644 --- a/drivers/scsi/cxgb3i/cxgb3i_iscsi.c +++ b/drivers/scsi/cxgb3i/cxgb3i_iscsi.c | |||
@@ -876,10 +876,10 @@ static struct scsi_host_template cxgb3i_host_template = { | |||
876 | .proc_name = "cxgb3i", | 876 | .proc_name = "cxgb3i", |
877 | .queuecommand = iscsi_queuecommand, | 877 | .queuecommand = iscsi_queuecommand, |
878 | .change_queue_depth = iscsi_change_queue_depth, | 878 | .change_queue_depth = iscsi_change_queue_depth, |
879 | .can_queue = CXGB3I_SCSI_QDEPTH_DFLT - 1, | 879 | .can_queue = CXGB3I_SCSI_HOST_QDEPTH, |
880 | .sg_tablesize = SG_ALL, | 880 | .sg_tablesize = SG_ALL, |
881 | .max_sectors = 0xFFFF, | 881 | .max_sectors = 0xFFFF, |
882 | .cmd_per_lun = CXGB3I_SCSI_QDEPTH_DFLT, | 882 | .cmd_per_lun = ISCSI_DEF_CMD_PER_LUN, |
883 | .eh_abort_handler = iscsi_eh_abort, | 883 | .eh_abort_handler = iscsi_eh_abort, |
884 | .eh_device_reset_handler = iscsi_eh_device_reset, | 884 | .eh_device_reset_handler = iscsi_eh_device_reset, |
885 | .eh_target_reset_handler = iscsi_eh_target_reset, | 885 | .eh_target_reset_handler = iscsi_eh_target_reset, |