diff options
author | Andrew Vasquez <andrew.vasquez@qlogic.com> | 2005-07-06 13:32:37 -0400 |
---|---|---|
committer | James Bottomley <jejb@mulgrave.(none)> | 2005-07-14 11:13:11 -0400 |
commit | cc4731f5b4539faea237bacd170a27a230a7e724 (patch) | |
tree | e1c9df14e591a29680b4a287972b74cc53f2b5d7 /drivers/scsi | |
parent | ae91193cd5bc80b4d62b1d4f0e7f3fea48f41ccd (diff) |
[SCSI] qla2xxx: Correct maximum supported lun and target-id definitions.
Correct maximum supported lun and target-id definitions.
The driver uses command-IOCBs which support a maximum lun
value of 0xffff -- correct #define to reflect the change.
Also, remove superfluous MAX_TARGET definition.
Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/scsi')
-rw-r--r-- | drivers/scsi/qla2xxx/qla_def.h | 3 | ||||
-rw-r--r-- | drivers/scsi/qla2xxx/qla_init.c | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h index 7a76e2aa6385..acf40dcbfb30 100644 --- a/drivers/scsi/qla2xxx/qla_def.h +++ b/drivers/scsi/qla2xxx/qla_def.h | |||
@@ -181,7 +181,7 @@ | |||
181 | */ | 181 | */ |
182 | #define WWN_SIZE 8 /* Size of WWPN, WWN & WWNN */ | 182 | #define WWN_SIZE 8 /* Size of WWPN, WWN & WWNN */ |
183 | #define MAX_FIBRE_DEVICES 512 | 183 | #define MAX_FIBRE_DEVICES 512 |
184 | #define MAX_FIBRE_LUNS 256 | 184 | #define MAX_FIBRE_LUNS 0xFFFF |
185 | #define MAX_RSCN_COUNT 32 | 185 | #define MAX_RSCN_COUNT 32 |
186 | #define MAX_HOST_COUNT 16 | 186 | #define MAX_HOST_COUNT 16 |
187 | 187 | ||
@@ -191,7 +191,6 @@ | |||
191 | #define MAX_BUSES 1 /* We only have one bus today */ | 191 | #define MAX_BUSES 1 /* We only have one bus today */ |
192 | #define MAX_TARGETS_2100 MAX_FIBRE_DEVICES | 192 | #define MAX_TARGETS_2100 MAX_FIBRE_DEVICES |
193 | #define MAX_TARGETS_2200 MAX_FIBRE_DEVICES | 193 | #define MAX_TARGETS_2200 MAX_FIBRE_DEVICES |
194 | #define MAX_TARGETS MAX_FIBRE_DEVICES | ||
195 | #define MIN_LUNS 8 | 194 | #define MIN_LUNS 8 |
196 | #define MAX_LUNS MAX_FIBRE_LUNS | 195 | #define MAX_LUNS MAX_FIBRE_LUNS |
197 | #define MAX_CMDS_PER_LUN 255 | 196 | #define MAX_CMDS_PER_LUN 255 |
diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c index ffe2ac66e69d..3fd63804319d 100644 --- a/drivers/scsi/qla2xxx/qla_init.c +++ b/drivers/scsi/qla2xxx/qla_init.c | |||
@@ -2094,7 +2094,8 @@ qla2x00_reg_remote_port(scsi_qla_host_t *ha, fc_port_t *fcport) | |||
2094 | qla_printk(KERN_WARNING, ha, | 2094 | qla_printk(KERN_WARNING, ha, |
2095 | "Unable to allocate fc remote port!\n"); | 2095 | "Unable to allocate fc remote port!\n"); |
2096 | 2096 | ||
2097 | if (rport->scsi_target_id != -1 && rport->scsi_target_id < MAX_TARGETS) | 2097 | if (rport->scsi_target_id != -1 && |
2098 | rport->scsi_target_id < ha->host->max_id) | ||
2098 | fcport->os_target_id = rport->scsi_target_id; | 2099 | fcport->os_target_id = rport->scsi_target_id; |
2099 | 2100 | ||
2100 | rport->dd_data = fcport; | 2101 | rport->dd_data = fcport; |