[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>

diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h
index 7a76e2aa638555a69b4ec590ba60b140ae8f16bc..acf40dcbfb308026320ada27352f9b924b2c6dfd 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_def.h
+++ b/drivers/scsi/qla2xxx/qla_def.h
@@ -181,7 +181,7 @@
  */
 #define WWN_SIZE               8       /* Size of WWPN, WWN & WWNN */
 #define MAX_FIBRE_DEVICES      512
-#define MAX_FIBRE_LUNS         256
+#define MAX_FIBRE_LUNS         0xFFFF
 #define        MAX_RSCN_COUNT          32
 #define        MAX_HOST_COUNT          16
 
@@ -191,7 +191,6 @@
 #define MAX_BUSES              1  /* We only have one bus today */
 #define MAX_TARGETS_2100       MAX_FIBRE_DEVICES
 #define MAX_TARGETS_2200       MAX_FIBRE_DEVICES
-#define MAX_TARGETS            MAX_FIBRE_DEVICES
 #define MIN_LUNS               8
 #define MAX_LUNS               MAX_FIBRE_LUNS
 #define MAX_CMDS_PER_LUN       255

diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index ffe2ac66e69db19f524eecd3b59a7dd2d8012d87..3fd63804319dc9048405b64af3af31e3ac57c9fd 100644 (file)
--- 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)
                qla_printk(KERN_WARNING, ha,
                    "Unable to allocate fc remote port!\n");
 
-       if (rport->scsi_target_id != -1 && rport->scsi_target_id < MAX_TARGETS)
+       if (rport->scsi_target_id != -1 &&
+           rport->scsi_target_id < ha->host->max_id)
                fcport->os_target_id = rport->scsi_target_id;
 
        rport->dd_data = fcport;