summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLalit Chandivade <lalit.chandivade@qlogic.com>2009-03-05 11:07:01 -0800
committerJames Bottomley <James.Bottomley@HansenPartnership.com>2009-03-10 09:27:54 -0500
commit605aa2bcd5e9dddc4666f12e0c19822809186d6d (patch)
tree425903ae029a7d7a9a9c4117dbf6c53ab828b288
parent6431c5dc5eeaa79863b4af300c081a01e2ccd0bb (diff)
downloadlinux-3.10-605aa2bcd5e9dddc4666f12e0c19822809186d6d.tar.gz
linux-3.10-605aa2bcd5e9dddc4666f12e0c19822809186d6d.tar.bz2
linux-3.10-605aa2bcd5e9dddc4666f12e0c19822809186d6d.zip
[SCSI] qla2xxx: Use correct value for max vport in LOOP topology.
Use minimum value for max vport during firmware initialization in LOOP topology. Using max vport value from get resource count in LOOP topology causes firmware initialization failure. Signed-off-by: Lalit Chandivade <lalit.chandivade@qlogic.com> Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com> Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
-rw-r--r--drivers/scsi/qla2xxx/qla_init.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index 986501759ad..14325c02733 100644
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -1308,8 +1308,12 @@ qla2x00_init_rings(scsi_qla_host_t *vha)
DEBUG(printk("scsi(%ld): Issue init firmware.\n", vha->host_no));
- if (ha->flags.npiv_supported)
+ if (ha->flags.npiv_supported) {
+ if (ha->operating_mode == LOOP)
+ ha->max_npiv_vports = MIN_MULTI_ID_FABRIC - 1;
mid_init_cb->count = cpu_to_le16(ha->max_npiv_vports);
+ }
+
mid_init_cb->options = __constant_cpu_to_le16(BIT_1);