Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1987807d authored by James Smart's avatar James Smart Committed by James Bottomley
Browse files

[SCSI] lpfc 8.3.7: Fix NPIV operation errors 



Fix NPIV operation errors:
- Fix vport not logging out of fabric when being deleted
- Fix vport fails to discover targets after devloss timeout.

Signed-off-by: default avatarJames Smart <james.smart@emulex.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@suse.de>
parent eeead811

drivers/scsi/lpfc/lpfc_els.c

+1 −1
Original line number Diff line number Diff line
@@ -5948,8 +5948,8 @@ lpfc_cmpl_reg_new_vport(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb) 
				lpfc_initial_fdisc(vport);

			break;

		}



	} else {

		vport->vpi_state |= LPFC_VPI_REGISTERED;

		if (vport == phba->pport)

			if (phba->sli_rev < LPFC_SLI_REV4)

				lpfc_issue_fabric_reglogin(vport);

drivers/scsi/lpfc/lpfc_hbadisc.c

+1 −0
Original line number Diff line number Diff line
@@ -2260,6 +2260,7 @@ lpfc_mbx_cmpl_unreg_vpi(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb) 
		break;

	}

	vport->vpi_state &= ~LPFC_VPI_REGISTERED;

	vport->fc_flag |= FC_VPORT_NEEDS_REG_VPI;

	vport->unreg_vpi_cmpl = VPORT_OK;

	mempool_free(pmb, phba->mbox_mem_pool);

	/*

drivers/scsi/lpfc/lpfc_vport.c

+1 −1
Original line number Diff line number Diff line
@@ -700,7 +700,7 @@ lpfc_vport_delete(struct fc_vport *fc_vport) 
			}

			spin_unlock_irq(&phba->ndlp_lock);

		}

		if (vport->vpi_state != LPFC_VPI_REGISTERED)

		if (!(vport->vpi_state & LPFC_VPI_REGISTERED))

			goto skip_logo;

		vport->unreg_vpi_cmpl = VPORT_INVAL;

		timeout = msecs_to_jiffies(phba->fc_ratov * 2000);