1 files changed, 3 insertions, 0 deletions

diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
index fa757b251f82..6fcddda58512 100644
--- a/drivers/scsi/lpfc/lpfc_init.c
+++ b/drivers/scsi/lpfc/lpfc_init.c
@@ -851,6 +851,8 @@ lpfc_handle_latt(struct lpfc_hba *phba)
         lpfc_read_la(phba, pmb, mp);
         pmb->mbox_cmpl = lpfc_mbx_cmpl_read_la;
         pmb->vport = vport;
+        /* Block ELS IOCBs until we have processed this mbox command */
+        phba->sli.ring[LPFC_ELS_RING].flag |= LPFC_STOP_IOCB_EVENT;
         rc = lpfc_sli_issue_mbox (phba, pmb, MBX_NOWAIT);
         if (rc == MBX_NOT_FINISHED) {
                 rc = 4;
@@ -866,6 +868,7 @@ lpfc_handle_latt(struct lpfc_hba *phba)
         return;
 
 lpfc_handle_latt_free_mbuf:
+        phba->sli.ring[LPFC_ELS_RING].flag &= ~LPFC_STOP_IOCB_EVENT;
         lpfc_mbuf_free(phba, mp->virt, mp->phys);
 lpfc_handle_latt_free_mp:
         kfree(mp);