diff options
| author | James Smart <james.smart@emulex.com> | 2012-03-02 07:37:54 +0400 |
|---|---|---|
| committer | James Bottomley <JBottomley@Parallels.com> | 2012-03-27 11:26:33 +0400 |
| commit | f5eca9be1424ffa76b36dce4a821c051b37a8ab9 (patch) | |
| tree | abe4481ff6b575f4c80ddf20b5d5b5a913071b92 /drivers/scsi | |
| parent | 9a6b09c071a5f66ed3c359d8631e07b34a9e738f (diff) | |
| download | linux-f5eca9be1424ffa76b36dce4a821c051b37a8ab9.tar.xz | |
[SCSI] lpfc 8.3.30: Fix handling of REG_VFI and cable pull.
Signed-off-by: Alex Iannicelli <alex.iannicelli@emulex.com>
Signed-off-by: James Smart <james.smart@emulex.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'drivers/scsi')
| -rw-r--r-- | drivers/scsi/lpfc/lpfc_hbadisc.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/scsi/lpfc/lpfc_hbadisc.c b/drivers/scsi/lpfc/lpfc_hbadisc.c index 24e4c0206482..b507536dc5b5 100644 --- a/drivers/scsi/lpfc/lpfc_hbadisc.c +++ b/drivers/scsi/lpfc/lpfc_hbadisc.c @@ -2843,7 +2843,14 @@ lpfc_mbx_cmpl_reg_vfi(struct lpfc_hba *phba, LPFC_MBOXQ_t *mboxq) struct lpfc_vport *vport = mboxq->vport; struct Scsi_Host *shost = lpfc_shost_from_vport(vport); - if (mboxq->u.mb.mbxStatus) { + /* + * VFI not supported for interface type 0, so ignore any mailbox + * error (except VFI in use) and continue with the discovery. + */ + if (mboxq->u.mb.mbxStatus && + (bf_get(lpfc_sli_intf_if_type, &phba->sli4_hba.sli_intf) != + LPFC_SLI_INTF_IF_TYPE_0) && + mboxq->u.mb.mbxStatus != MBX_VFI_IN_USE) { lpfc_printf_vlog(vport, KERN_ERR, LOG_MBOX, "2018 REG_VFI mbxStatus error x%x " "HBA state x%x\n", |