1 files changed, 8 insertions, 2 deletions

diff --git a/drivers/scsi/lpfc/lpfc_nportdisc.c b/drivers/scsi/lpfc/lpfc_nportdisc.c
index 4cb9882af157..af3b38aba65e 100644
--- a/drivers/scsi/lpfc/lpfc_nportdisc.c
+++ b/drivers/scsi/lpfc/lpfc_nportdisc.c
@@ -661,7 +661,13 @@ lpfc_rcv_logo(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
                         lpfc_destroy_vport_work_array(phba, vports);
                 }
 
-                if (active_vlink_present) {
+                /*
+                 * Don't re-instantiate if vport is marked for deletion.
+                 * If we are here first then vport_delete is going to wait
+                 * for discovery to complete.
+                 */
+                if (!(vport->load_flag & FC_UNLOADING) &&
+                                        active_vlink_present) {
                         /*
                          * If there are other active VLinks present,
                          * re-instantiate the Vlink using FDISC.
@@ -1868,7 +1874,7 @@ lpfc_rcv_logo_logo_issue(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
         struct lpfc_iocbq *cmdiocb = (struct lpfc_iocbq *)arg;
 
         spin_lock_irq(shost->host_lock);
-        ndlp->nlp_flag &= NLP_LOGO_ACC;
+        ndlp->nlp_flag |= NLP_LOGO_ACC;
         spin_unlock_irq(shost->host_lock);
         lpfc_els_rsp_acc(vport, ELS_CMD_ACC, cmdiocb, ndlp, NULL);
         return ndlp->nlp_state;