From 4d1d55cc7baa054abe1b16de26e08df9943c54e1 Mon Sep 17 00:00:00 2001
From: Lalit Chandivade <lalit.chandivade@qlogic.com>
Date: Thu, 5 Mar 2009 11:07:01 -0800
Subject: [PATCH] --- yaml --- r: 132339 b: refs/heads/master c:
 605aa2bcd5e9dddc4666f12e0c19822809186d6d h: refs/heads/master i:   132337:
 7e5dd4a4667cd2854cf2271ed09fd53a5c0ada71   132335:
 e209beb115db3d1b2ad17e47ff54fbdeddfd608d v: v3

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

diff --git a/[refs] b/[refs]
index ef5c48e2723d..7f0d9bfa82e8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6431c5dc5eeaa79863b4af300c081a01e2ccd0bb
+refs/heads/master: 605aa2bcd5e9dddc4666f12e0c19822809186d6d
diff --git a/trunk/drivers/scsi/qla2xxx/qla_init.c b/trunk/drivers/scsi/qla2xxx/qla_init.c
index 986501759ad4..14325c027336 100644
--- a/trunk/drivers/scsi/qla2xxx/qla_init.c
+++ b/trunk/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);