[PATCH v2 02/13] qla2xxx: Set IIDMA and fcport state before qla_nvme_register_remote()

[Himanshu Madhani]

From: Darren Trapp <darren.tr...@cavium.com>

Signed-off-by: Darren Trapp <darren.tr...@cavium.com>
Signed-off-by: Himanshu Madhani <himanshu.madh...@cavium.com>
Reviewed-by: Hannes Reinecke <h...@suse.com>
---
 drivers/scsi/qla2xxx/qla_init.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index cb182b102bfd..6caccc52376a 100644
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -5110,13 +5110,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:
-- 
2.12.0