diff mbox series

Revert "scsi: qla2xxx: Fix NVMe Target discovery"

Message ID 20181207054942.3650-1-hmadhani@marvell.com (mailing list archive)
State Accepted
Commit c64a87f9518409d0a439895f09f6149ffdd427b8
Headers show
Series Revert "scsi: qla2xxx: Fix NVMe Target discovery" | expand

Commit Message

Himanshu Madhani Dec. 7, 2018, 5:49 a.m. UTC 
This reverts commit db186382af21e926e90df19499475f2552192b77.

This commit introduced regression with FCP discovery so revert
it back to fix discovery for FCP luns

Cc: <stable@vger.kernel.org>
Signed-off-by: Himanshu Madhani <hmadhani@marvell.com>
---
Hi Martin, 

This patch has introduced regression for LUN discovery with FC. 

Please apply this revert to 4.20/scsi-fixes branch at your earliest convenience.

Thanks,
Himanshu
---
 drivers/scsi/qla2xxx/qla_os.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Martin K. Petersen Dec. 8, 2018, 3:23 a.m. UTC | #1 
Himanshu,

> This reverts commit db186382af21e926e90df19499475f2552192b77.
>
> This commit introduced regression with FCP discovery so revert it back
> to fix discovery for FCP luns

Applied to 4.20/scsi-fixes.
diff mbox series

Patch

diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index b658b9a5eb1e..d0ecc729a90a 100644
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -4886,10 +4886,10 @@  void qla24xx_create_new_sess(struct scsi_qla_host *vha, struct qla_work_evt *e)
 			fcport->d_id = e->u.new_sess.id;
 			fcport->flags |= FCF_FABRIC_DEVICE;
 			fcport->fw_login_state = DSC_LS_PLOGI_PEND;
-			if (e->u.new_sess.fc4_type & FS_FC4TYPE_FCP)
+			if (e->u.new_sess.fc4_type == FS_FC4TYPE_FCP)
 				fcport->fc4_type = FC4_TYPE_FCP_SCSI;
 
-			if (e->u.new_sess.fc4_type & FS_FC4TYPE_NVME) {
+			if (e->u.new_sess.fc4_type == FS_FC4TYPE_NVME) {
 				fcport->fc4_type = FC4_TYPE_OTHER;
 				fcport->fc4f_nvme = FC4_TYPE_NVME;
 			}