From 9512f1393efc75dbbad6c3a4ced5d8abb855c878 Mon Sep 17 00:00:00 2001
From: Mike Hernandez <mike.hernandez@qlogic.com>
Date: Wed, 13 Aug 2008 21:36:59 -0700
Subject: [PATCH] --- yaml --- r: 108887 b: refs/heads/master c:
 946fb8915a47bbd76de75b2ae7f1c7e92c0666ca h: refs/heads/master i:   108885:
 59f2ceaa6b6ecfa58be6e21e4e677d6c49dbf58d   108883:
 aaaa9b1a9add3984d5aeacaae2430346b5b758c0   108879:
 f810f03f01815993423c8bd4051421dbf7cae606 v: v3

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

diff --git a/[refs] b/[refs]
index 9593b8070d96..c318dbdca1b7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bed475c4cde5d12f537f445bdd0a5a3bb5684481
+refs/heads/master: 946fb8915a47bbd76de75b2ae7f1c7e92c0666ca
diff --git a/trunk/drivers/scsi/qla2xxx/qla_init.c b/trunk/drivers/scsi/qla2xxx/qla_init.c
index e1de7a696bf7..ee89ddd64aae 100644
--- a/trunk/drivers/scsi/qla2xxx/qla_init.c
+++ b/trunk/drivers/scsi/qla2xxx/qla_init.c
@@ -976,8 +976,9 @@ qla2x00_setup_chip(scsi_qla_host_t *ha)
 				    &ha->fw_attributes, &ha->fw_memory_size);
 				qla2x00_resize_request_q(ha);
 				ha->flags.npiv_supported = 0;
-				if ((IS_QLA24XX(ha) || IS_QLA25XX(ha)) &&
-				    (ha->fw_attributes & BIT_2)) {
+				if ((IS_QLA24XX(ha) || IS_QLA25XX(ha) ||
+				     IS_QLA84XX(ha)) &&
+					 (ha->fw_attributes & BIT_2)) {
 					ha->flags.npiv_supported = 1;
 					if ((!ha->max_npiv_vports) ||
 					    ((ha->max_npiv_vports + 1) %