diff options
-rw-r--r-- | drivers/scsi/lpfc/lpfc_attr.c | 10 | ||||
-rw-r--r-- | drivers/scsi/lpfc/lpfc_scsi.c | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/drivers/scsi/lpfc/lpfc_attr.c b/drivers/scsi/lpfc/lpfc_attr.c index 23ce45708335..87c2b6b858f7 100644 --- a/drivers/scsi/lpfc/lpfc_attr.c +++ b/drivers/scsi/lpfc/lpfc_attr.c | |||
@@ -4370,6 +4370,14 @@ lpfc_get_starget_port_name(struct scsi_target *starget) | |||
4370 | ndlp ? wwn_to_u64(ndlp->nlp_portname.u.wwn) : 0; | 4370 | ndlp ? wwn_to_u64(ndlp->nlp_portname.u.wwn) : 0; |
4371 | } | 4371 | } |
4372 | 4372 | ||
4373 | static void | ||
4374 | lpfc_get_host_def_loss_tmo(struct Scsi_Host *shost) | ||
4375 | { | ||
4376 | struct lpfc_vport *vport = (struct lpfc_vport *) shost->hostdata; | ||
4377 | |||
4378 | fc_host_def_dev_loss_tmo(shost) = vport->cfg_devloss_tmo; | ||
4379 | } | ||
4380 | |||
4373 | /** | 4381 | /** |
4374 | * lpfc_set_rport_loss_tmo - Set the rport dev loss tmo | 4382 | * lpfc_set_rport_loss_tmo - Set the rport dev loss tmo |
4375 | * @rport: fc rport address. | 4383 | * @rport: fc rport address. |
@@ -4478,6 +4486,7 @@ struct fc_function_template lpfc_transport_functions = { | |||
4478 | .get_host_fabric_name = lpfc_get_host_fabric_name, | 4486 | .get_host_fabric_name = lpfc_get_host_fabric_name, |
4479 | .show_host_fabric_name = 1, | 4487 | .show_host_fabric_name = 1, |
4480 | 4488 | ||
4489 | .get_host_def_dev_loss_tmo = lpfc_get_host_def_loss_tmo, | ||
4481 | /* | 4490 | /* |
4482 | * The LPFC driver treats linkdown handling as target loss events | 4491 | * The LPFC driver treats linkdown handling as target loss events |
4483 | * so there are no sysfs handlers for link_down_tmo. | 4492 | * so there are no sysfs handlers for link_down_tmo. |
@@ -4545,6 +4554,7 @@ struct fc_function_template lpfc_vport_transport_functions = { | |||
4545 | .get_host_fabric_name = lpfc_get_host_fabric_name, | 4554 | .get_host_fabric_name = lpfc_get_host_fabric_name, |
4546 | .show_host_fabric_name = 1, | 4555 | .show_host_fabric_name = 1, |
4547 | 4556 | ||
4557 | .get_host_def_dev_loss_tmo = lpfc_get_host_def_loss_tmo, | ||
4548 | /* | 4558 | /* |
4549 | * The LPFC driver treats linkdown handling as target loss events | 4559 | * The LPFC driver treats linkdown handling as target loss events |
4550 | * so there are no sysfs handlers for link_down_tmo. | 4560 | * so there are no sysfs handlers for link_down_tmo. |
diff --git a/drivers/scsi/lpfc/lpfc_scsi.c b/drivers/scsi/lpfc/lpfc_scsi.c index 2e51aa6b45b3..6e331c73170e 100644 --- a/drivers/scsi/lpfc/lpfc_scsi.c +++ b/drivers/scsi/lpfc/lpfc_scsi.c | |||
@@ -3656,7 +3656,6 @@ lpfc_slave_alloc(struct scsi_device *sdev) | |||
3656 | * | 3656 | * |
3657 | * This routine configures following items | 3657 | * This routine configures following items |
3658 | * - Tag command queuing support for @sdev if supported. | 3658 | * - Tag command queuing support for @sdev if supported. |
3659 | * - Dev loss time out value of fc_rport. | ||
3660 | * - Enable SLI polling for fcp ring if ENABLE_FCP_RING_POLLING flag is set. | 3659 | * - Enable SLI polling for fcp ring if ENABLE_FCP_RING_POLLING flag is set. |
3661 | * | 3660 | * |
3662 | * Return codes: | 3661 | * Return codes: |
@@ -3667,21 +3666,12 @@ lpfc_slave_configure(struct scsi_device *sdev) | |||
3667 | { | 3666 | { |
3668 | struct lpfc_vport *vport = (struct lpfc_vport *) sdev->host->hostdata; | 3667 | struct lpfc_vport *vport = (struct lpfc_vport *) sdev->host->hostdata; |
3669 | struct lpfc_hba *phba = vport->phba; | 3668 | struct lpfc_hba *phba = vport->phba; |
3670 | struct fc_rport *rport = starget_to_rport(sdev->sdev_target); | ||
3671 | 3669 | ||
3672 | if (sdev->tagged_supported) | 3670 | if (sdev->tagged_supported) |
3673 | scsi_activate_tcq(sdev, vport->cfg_lun_queue_depth); | 3671 | scsi_activate_tcq(sdev, vport->cfg_lun_queue_depth); |
3674 | else | 3672 | else |
3675 | scsi_deactivate_tcq(sdev, vport->cfg_lun_queue_depth); | 3673 | scsi_deactivate_tcq(sdev, vport->cfg_lun_queue_depth); |
3676 | 3674 | ||
3677 | /* | ||
3678 | * Initialize the fc transport attributes for the target | ||
3679 | * containing this scsi device. Also note that the driver's | ||
3680 | * target pointer is stored in the starget_data for the | ||
3681 | * driver's sysfs entry point functions. | ||
3682 | */ | ||
3683 | rport->dev_loss_tmo = vport->cfg_devloss_tmo; | ||
3684 | |||
3685 | if (phba->cfg_poll & ENABLE_FCP_RING_POLLING) { | 3675 | if (phba->cfg_poll & ENABLE_FCP_RING_POLLING) { |
3686 | lpfc_sli_handle_fast_ring_event(phba, | 3676 | lpfc_sli_handle_fast_ring_event(phba, |
3687 | &phba->sli.ring[LPFC_FCP_RING], HA_R0RE_REQ); | 3677 | &phba->sli.ring[LPFC_FCP_RING], HA_R0RE_REQ); |