diff options
| author | James Smart <james.smart@broadcom.com> | 2016-07-06 15:36:08 -0400 |
|---|---|---|
| committer | Martin K. Petersen <martin.petersen@oracle.com> | 2016-07-15 15:25:06 -0400 |
| commit | 8eb8b960fd0593baaddd1c01cbff6b85c5056ccf (patch) | |
| tree | a53a84b70e8359e384db4591ebcf5e1eb76944cd /drivers/scsi/lpfc/lpfc_els.c | |
| parent | 458c083e83ed2f8e446cf1a38dd21996cebe6da0 (diff) | |
lpfc: Remove global lpfc_delay_discovery attribute in leiu of per-hba lpfc_delay_discovery
Remove global lpfc_delay_discovery attribute in leiu of per-hba
lpfc_delay_discovery
Signed-off-by: Dick Kennedy <dick.kennedy@broadcom.com>
Signed-off-by: James Smart <james.smart@broadcom.com>
Reviewed-by: Hannes Reinecke <hare@suse.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Diffstat (limited to 'drivers/scsi/lpfc/lpfc_els.c')
| -rw-r--r-- | drivers/scsi/lpfc/lpfc_els.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/scsi/lpfc/lpfc_els.c b/drivers/scsi/lpfc/lpfc_els.c index 5afbf4d06d53..c0af32f24954 100644 --- a/drivers/scsi/lpfc/lpfc_els.c +++ b/drivers/scsi/lpfc/lpfc_els.c | |||
| @@ -594,6 +594,7 @@ static uint8_t | |||
| 594 | lpfc_check_clean_addr_bit(struct lpfc_vport *vport, | 594 | lpfc_check_clean_addr_bit(struct lpfc_vport *vport, |
| 595 | struct serv_parm *sp) | 595 | struct serv_parm *sp) |
| 596 | { | 596 | { |
| 597 | struct lpfc_hba *phba = vport->phba; | ||
| 597 | uint8_t fabric_param_changed = 0; | 598 | uint8_t fabric_param_changed = 0; |
| 598 | struct Scsi_Host *shost = lpfc_shost_from_vport(vport); | 599 | struct Scsi_Host *shost = lpfc_shost_from_vport(vport); |
| 599 | 600 | ||
| @@ -615,7 +616,7 @@ lpfc_check_clean_addr_bit(struct lpfc_vport *vport, | |||
| 615 | * - lpfc_delay_discovery module parameter is set. | 616 | * - lpfc_delay_discovery module parameter is set. |
| 616 | */ | 617 | */ |
| 617 | if (fabric_param_changed && !sp->cmn.clean_address_bit && | 618 | if (fabric_param_changed && !sp->cmn.clean_address_bit && |
| 618 | (vport->fc_prevDID || lpfc_delay_discovery)) { | 619 | (vport->fc_prevDID || phba->cfg_delay_discovery)) { |
| 619 | spin_lock_irq(shost->host_lock); | 620 | spin_lock_irq(shost->host_lock); |
| 620 | vport->fc_flag |= FC_DISC_DELAYED; | 621 | vport->fc_flag |= FC_DISC_DELAYED; |
| 621 | spin_unlock_irq(shost->host_lock); | 622 | spin_unlock_irq(shost->host_lock); |