From 97e4a214fec9a7aaa567d732b22c113fdaeff01d Mon Sep 17 00:00:00 2001 From: James Smart Date: Thu, 1 Mar 2012 22:37:54 -0500 Subject: [PATCH] --- yaml --- r: 298257 b: refs/heads/master c: f5eca9be1424ffa76b36dce4a821c051b37a8ab9 h: refs/heads/master i: 298255: 6430fca4f9b5113606ccebc342793bda4e35e95e v: v3 --- [refs] | 2 +- trunk/drivers/scsi/lpfc/lpfc_hbadisc.c | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index b5765286229f..aeb3796b977c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9a6b09c071a5f66ed3c359d8631e07b34a9e738f +refs/heads/master: f5eca9be1424ffa76b36dce4a821c051b37a8ab9 diff --git a/trunk/drivers/scsi/lpfc/lpfc_hbadisc.c b/trunk/drivers/scsi/lpfc/lpfc_hbadisc.c index 24e4c0206482..b507536dc5b5 100644 --- a/trunk/drivers/scsi/lpfc/lpfc_hbadisc.c +++ b/trunk/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",