Merge tag 'kbuild-v5.17' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy...

[linux-2.6-microblaze.git] / drivers / scsi / qla2xxx / qla_nvme.c

diff --git a/drivers/scsi/qla2xxx/qla_nvme.c b/drivers/scsi/qla2xxx/qla_nvme.c
index 138ffdb..e22ec7c 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_nvme.c
+++ b/drivers/scsi/qla2xxx/qla_nvme.c
@@ -43,7 +43,7 @@ int qla_nvme_register_remote(struct scsi_qla_host *vha, struct fc_port *fcport)
        req.port_name = wwn_to_u64(fcport->port_name);
        req.node_name = wwn_to_u64(fcport->node_name);
        req.port_role = 0;
-       req.dev_loss_tmo = 0;
+       req.dev_loss_tmo = fcport->dev_loss_tmo;
 
        if (fcport->nvme_prli_service_param & NVME_PRLI_SP_INITIATOR)
                req.port_role = FC_PORT_ROLE_NVME_INITIATOR;
@@ -70,6 +70,9 @@ int qla_nvme_register_remote(struct scsi_qla_host *vha, struct fc_port *fcport)
                return ret;
        }
 
+       nvme_fc_set_remoteport_devloss(fcport->nvme_remote_port,
+                                      fcport->dev_loss_tmo);
+
        if (fcport->nvme_prli_service_param & NVME_PRLI_SP_SLER)
                ql_log(ql_log_info, vha, 0x212a,
                       "PortID:%06x Supports SLER\n", req.port_id);