From 872daee5e526d3d58d4c9ddcfc9c08324f28843d Mon Sep 17 00:00:00 2001
From: Saurav Kashyap <saurav.kashyap@qlogic.com>
Date: Wed, 22 Aug 2012 14:21:21 -0400
Subject: [PATCH] --- yaml --- r: 328853 b: refs/heads/master c:
 45980cc22edc324d145978340bd3fc6dd8417f81 h: refs/heads/master i:   328851:
 a921bf0c9c30b67bafad6d39c4b6a83468642a8f v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/scsi/qla2xxx/qla_init.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 494df31ceda7..77c22acc49cb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9567611215ed503985da9558dbc38b0034f318fd
+refs/heads/master: 45980cc22edc324d145978340bd3fc6dd8417f81
diff --git a/trunk/drivers/scsi/qla2xxx/qla_init.c b/trunk/drivers/scsi/qla2xxx/qla_init.c
index f4bbf1cee6b7..075059de60f3 100644
--- a/trunk/drivers/scsi/qla2xxx/qla_init.c
+++ b/trunk/drivers/scsi/qla2xxx/qla_init.c
@@ -1907,7 +1907,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);
 	}