From: Sawan Chandak <sawan.chandak@cavium.com>
Date: Wed, 23 Aug 2017 22:05:02 +0000 (-0700)
Subject: scsi: qla2xxx: Use BIT_6 to acquire FAWWPN from switch
X-Git-Tag: v4.13.4~33
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=2d0f8273a1e2f1857abd1631cf395c02872dbcb3;p=users%2Fdwmw2%2Flinux.git

scsi: qla2xxx: Use BIT_6 to acquire FAWWPN from switch

commit fcc5b5cd726c0779cd689362aea82cc9d5a61346 upstream.

If FA-WWPN feature disabled on the switch side and enabled for the
adapter, then driver would update the port name with switch port name.

This patch fixes issue by checking correct BIT flag to validate.

Fixes: 41dc529a4602 ("qla2xxx: Improve RSCN handling in driver")
Signed-off-by: Sawan Chandak <sawan.chandak@cavium.com>
Signed-off-by: Himanshu Madhani <himanshu.madhani@cavium.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/scsi/qla2xxx/qla_mbx.c b/drivers/scsi/qla2xxx/qla_mbx.c
index 7308dd41bc5dc..1f1a81c6eaa93 100644
--- a/drivers/scsi/qla2xxx/qla_mbx.c
+++ b/drivers/scsi/qla2xxx/qla_mbx.c
@@ -3690,7 +3690,7 @@ qla24xx_report_id_acquisition(scsi_qla_host_t *vha,
 				if (qla_ini_mode_enabled(vha) &&
 				    ha->flags.fawwpn_enabled &&
 				    (rptid_entry->u.f1.flags &
-				     VP_FLAGS_NAME_VALID)) {
+				     BIT_6)) {
 					memcpy(vha->port_name,
 					    rptid_entry->u.f1.port_name,
 					    WWN_SIZE);