---

yaml --- r: 132339 b: refs/heads/master c: 605aa2b h: refs/heads/master i: 132337: 7e5dd4a 132335: e209beb v: v3
git-mirror · Mar 10, 2009 · 4d1d55c · 4d1d55c
1 parent c2ac0de
commit 4d1d55c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git 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
@@ -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);