From: Saurav Kashyap <saurav.kashyap@qlogic.com>
Date: Fri, 13 Jul 2012 20:14:13 +0000 (-0500)
Subject: qla2xxx: Do not restrict the number of NPIV ports for ISP83xx.
X-Git-Tag: v2.6.39-400.9.0~411
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=22503dead54fde569ef1c51aafa7b86627cb1b4f;p=users%2Fjedix%2Flinux-maple.git

qla2xxx: Do not restrict the number of NPIV ports for ISP83xx.

JIRA Key: V2632FC-236
---

diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index d0df5dc237e3..98f482478dbe 100644
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -1894,7 +1894,7 @@ qla2x00_init_rings(scsi_qla_host_t *vha)
 	ql_dbg(ql_dbg_init, vha, 0x00d1, "Issue init firmware.\n");
 
 	if (ha->flags.npiv_supported) {
-		if (ha->operating_mode == LOOP)
+		if (ha->operating_mode == LOOP && !IS_CNA_CAPABLE(ha))
 			ha->max_npiv_vports = MIN_MULTI_ID_FABRIC - 1;
 		mid_init_cb->count = cpu_to_le16(ha->max_npiv_vports);
 	}