From: Darren Trapp <darren.trapp@cavium.com>
Date: Wed, 21 Mar 2018 06:09:31 +0000 (-0700)
Subject: scsi: qla2xxx: Set IIDMA and fcport state before qla_nvme_register_remote()
X-Git-Tag: v4.17-rc1~112^2~19
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dbe18018e3ad60fc5abfe999b49c4b37f8e7bb32;p=thirdparty%2Fkernel%2Flinux.git

scsi: qla2xxx: Set IIDMA and fcport state before qla_nvme_register_remote()

Signed-off-by: Darren Trapp <darren.trapp@cavium.com>
Signed-off-by: Himanshu Madhani <himanshu.madhani@cavium.com>
Reviewed-by: Hannes Reinecke <hare@suse.com>
Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
---

diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index 590aa904fdef1..1878a6f24ddb7 100644
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -5107,13 +5107,14 @@ qla2x00_update_fcport(scsi_qla_host_t *vha, fc_port_t *fcport)
 	fcport->deleted = 0;
 	fcport->logout_on_delete = 1;
 
+	qla2x00_set_fcport_state(fcport, FCS_ONLINE);
+	qla2x00_iidma_fcport(vha, fcport);
+
 	if (fcport->fc4f_nvme) {
 		qla_nvme_register_remote(vha, fcport);
 		return;
 	}
 
-	qla2x00_set_fcport_state(fcport, FCS_ONLINE);
-	qla2x00_iidma_fcport(vha, fcport);
 	qla24xx_update_fcport_fcp_prio(vha, fcport);
 
 reg_port: