2 files changed, 6 insertions, 0 deletions

diff --git a/drivers/scsi/lpfc/lpfc_els.c b/drivers/scsi/lpfc/lpfc_els.c
index bcc29ec126d..20f1a0713db 100644
--- a/drivers/scsi/lpfc/lpfc_els.c
+++ b/drivers/scsi/lpfc/lpfc_els.c
@@ -720,6 +720,7 @@ lpfc_cmpl_els_plogi(struct lpfc_hba * phba, struct lpfc_iocbq * cmdiocb,
                 /* Do not call DSM for lpfc_els_abort'ed ELS cmds */
                 if ((irsp->ulpStatus == IOSTAT_LOCAL_REJECT) &&
                    ((irsp->un.ulpWord[4] == IOERR_SLI_ABORTED) ||
+                   (irsp->un.ulpWord[4] == IOERR_LINK_DOWN) ||
                    (irsp->un.ulpWord[4] == IOERR_SLI_DOWN))) {
                         disc = (ndlp->nlp_flag & NLP_NPR_2B_DISC);
                 }
@@ -869,6 +870,7 @@ lpfc_cmpl_els_prli(struct lpfc_hba * phba, struct lpfc_iocbq * cmdiocb,
                 /* Do not call DSM for lpfc_els_abort'ed ELS cmds */
                 if ((irsp->ulpStatus == IOSTAT_LOCAL_REJECT) &&
                    ((irsp->un.ulpWord[4] == IOERR_SLI_ABORTED) ||
+                   (irsp->un.ulpWord[4] == IOERR_LINK_DOWN) ||
                    (irsp->un.ulpWord[4] == IOERR_SLI_DOWN))) {
                         goto out;
                 }
@@ -1054,6 +1056,7 @@ lpfc_cmpl_els_adisc(struct lpfc_hba * phba, struct lpfc_iocbq * cmdiocb,
                 /* Do not call DSM for lpfc_els_abort'ed ELS cmds */
                 if ((irsp->ulpStatus == IOSTAT_LOCAL_REJECT) &&
                    ((irsp->un.ulpWord[4] == IOERR_SLI_ABORTED) ||
+                   (irsp->un.ulpWord[4] == IOERR_LINK_DOWN) ||
                    (irsp->un.ulpWord[4] == IOERR_SLI_DOWN))) {
                         disc = (ndlp->nlp_flag & NLP_NPR_2B_DISC);
                 }
@@ -1205,6 +1208,7 @@ lpfc_cmpl_els_logo(struct lpfc_hba * phba, struct lpfc_iocbq * cmdiocb,
                 /* Do not call DSM for lpfc_els_abort'ed ELS cmds */
                 if ((irsp->ulpStatus == IOSTAT_LOCAL_REJECT) &&
                    ((irsp->un.ulpWord[4] == IOERR_SLI_ABORTED) ||
+                   (irsp->un.ulpWord[4] == IOERR_LINK_DOWN) ||
                    (irsp->un.ulpWord[4] == IOERR_SLI_DOWN))) {
                         goto out;
                 }
diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
index 3eebe663a2e..4d4e217edd8 100644
--- a/drivers/scsi/lpfc/lpfc_init.c
+++ b/drivers/scsi/lpfc/lpfc_init.c
@@ -563,6 +563,8 @@ lpfc_handle_latt(struct lpfc_hba * phba)
 
         rc = -EIO;
 
+        /* Cleanup any outstanding ELS commands */
+        lpfc_els_flush_cmd(phba);
 
         psli->slistat.link_event++;
         lpfc_read_la(phba, pmb, mp);