summaryrefslogtreecommitdiffstats
path: root/drivers/scsi/qla2xxx/qla_init.c
diff options
context:
space:
mode:
authorDarren Trapp2018-03-21 07:09:31 +0100
committerMartin K. Petersen2018-03-21 23:38:54 +0100
commitdbe18018e3ad60fc5abfe999b49c4b37f8e7bb32 (patch)
tree510c8457342f2144cc152bc793b2ea28e260d1ba /drivers/scsi/qla2xxx/qla_init.c
parentscsi: qla2xxx: Remove unneeded message and minor cleanup for FC-NVMe (diff)
downloadkernel-qcow2-linux-dbe18018e3ad60fc5abfe999b49c4b37f8e7bb32.tar.gz
kernel-qcow2-linux-dbe18018e3ad60fc5abfe999b49c4b37f8e7bb32.tar.xz
kernel-qcow2-linux-dbe18018e3ad60fc5abfe999b49c4b37f8e7bb32.zip
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>
Diffstat (limited to 'drivers/scsi/qla2xxx/qla_init.c')
-rw-r--r--drivers/scsi/qla2xxx/qla_init.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index 590aa904fdef..1878a6f24ddb 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: