1 files changed, 9 insertions, 0 deletions

diff --git a/drivers/scsi/lpfc/lpfc_els.c b/drivers/scsi/lpfc/lpfc_els.c
index 4c25485aa934..c66088d0fd2a 100644
--- a/drivers/scsi/lpfc/lpfc_els.c
+++ b/drivers/scsi/lpfc/lpfc_els.c
@@ -2225,6 +2225,15 @@ lpfc_adisc_done(struct lpfc_vport *vport)
         if ((phba->sli3_options & LPFC_SLI3_NPIV_ENABLED) &&
             !(vport->fc_flag & FC_RSCN_MODE) &&
             (phba->sli_rev < LPFC_SLI_REV4)) {
+                /* The ADISCs are complete.  Doesn't matter if they
+                 * succeeded or failed because the ADISC completion
+                 * routine guarantees to call the state machine and
+                 * the RPI is either unregistered (failed ADISC response)
+                 * or the RPI is still valid and the node is marked
+                 * mapped for a target.  The exchanges should be in the
+                 * correct state. This code is specific to SLI3.
+                 */
+                lpfc_issue_clear_la(phba, vport);
                 lpfc_issue_reg_vpi(phba, vport);
                 return;
         }