mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-05 08:26:59 +00:00
[SCSI] lpfc 8.3.39: Fixed driver handling of CLEAR_LA with NPIV enabled causing SID=0 frames out
Signed-off-by: James Smart <james.smart@emulex.com> Signed-off-by: James Bottomley <JBottomley@Parallels.com>
This commit is contained in:
parent
88f43a0867
commit
6fa139f300
1 changed files with 3 additions and 4 deletions
|
@ -1009,9 +1009,6 @@ lpfc_linkup(struct lpfc_hba *phba)
|
||||||
for (i = 0; i <= phba->max_vports && vports[i] != NULL; i++)
|
for (i = 0; i <= phba->max_vports && vports[i] != NULL; i++)
|
||||||
lpfc_linkup_port(vports[i]);
|
lpfc_linkup_port(vports[i]);
|
||||||
lpfc_destroy_vport_work_array(phba, vports);
|
lpfc_destroy_vport_work_array(phba, vports);
|
||||||
if ((phba->sli3_options & LPFC_SLI3_NPIV_ENABLED) &&
|
|
||||||
(phba->sli_rev < LPFC_SLI_REV4))
|
|
||||||
lpfc_issue_clear_la(phba, phba->pport);
|
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
@ -5028,11 +5025,13 @@ lpfc_disc_start(struct lpfc_vport *vport)
|
||||||
if (num_sent)
|
if (num_sent)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
/* Register the VPI for SLI3, NON-NPIV only. */
|
/* Register the VPI for SLI3, NPIV only. */
|
||||||
if ((phba->sli3_options & LPFC_SLI3_NPIV_ENABLED) &&
|
if ((phba->sli3_options & LPFC_SLI3_NPIV_ENABLED) &&
|
||||||
!(vport->fc_flag & FC_PT2PT) &&
|
!(vport->fc_flag & FC_PT2PT) &&
|
||||||
!(vport->fc_flag & FC_RSCN_MODE) &&
|
!(vport->fc_flag & FC_RSCN_MODE) &&
|
||||||
(phba->sli_rev < LPFC_SLI_REV4)) {
|
(phba->sli_rev < LPFC_SLI_REV4)) {
|
||||||
|
if (vport->port_type == LPFC_PHYSICAL_PORT)
|
||||||
|
lpfc_issue_clear_la(phba, vport);
|
||||||
lpfc_issue_reg_vpi(phba, vport);
|
lpfc_issue_reg_vpi(phba, vport);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue