[SCSI] lpfc 8.1.2: Misc FC Discovery changes :

Misc FC Discovery changes :
   - Added FC_BYPASSED_MODE statistic
   - Corrected some log message data
   - Fix up Discovery infrastructure to support FAN:
       Allow Fabric entities to flow thru DSM
       Fix up linkup/linkdown unregister login processing for Fabric entities
       Clean up Discovery code
       Utilize nodev_tmo for Fabric entities
   - Use of 3 * ratov for CT handling timeouts
   - Fix up DSM to make more appropriate decisions and clean up code.

Signed-off-by: Jamie Wellnitz <Jamie.Wellnitz@emulex.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

1 files changed, 166 insertions, 117 deletions

diff --git a/drivers/scsi/lpfc/lpfc_nportdisc.c b/drivers/scsi/lpfc/lpfc_nportdisc.c
index 1c04ea353ffa..a580e1e50672 100644
--- a/drivers/scsi/lpfc/lpfc_nportdisc.c
+++ b/drivers/scsi/lpfc/lpfc_nportdisc.c
@@ -46,13 +46,13 @@ lpfc_check_adisc(struct lpfc_hba * phba, struct lpfc_nodelist * ndlp,
          * table entry for that node.
          */
         if (memcmp(nn, &ndlp->nlp_nodename, sizeof (struct lpfc_name)) != 0)
-                return (0);
+                return 0;
 
         if (memcmp(pn, &ndlp->nlp_portname, sizeof (struct lpfc_name)) != 0)
-                return (0);
+                return 0;
 
         /* we match, return success */
-        return (1);
+        return 1;
 }
 
 int
@@ -159,7 +159,7 @@ lpfc_check_elscmpl_iocb(struct lpfc_hba * phba,
                 }
                 ptr = NULL;
         }
-        return (ptr);
+        return ptr;
 }
 
 
@@ -266,7 +266,7 @@ lpfc_els_abort(struct lpfc_hba * phba, struct lpfc_nodelist * ndlp,
                 if (!list_empty(&ndlp->els_retry_evt.evt_listp))
                         list_del_init(&ndlp->els_retry_evt.evt_listp);
         }
-        return (0);
+        return 0;
 }
 
 static int
@@ -321,7 +321,7 @@ lpfc_rcv_plogi(struct lpfc_hba * phba,
                 stat.un.b.lsRjtRsnCode = LSRJT_UNABLE_TPC;
                 stat.un.b.lsRjtRsnCodeExp = LSEXP_SPARM_OPTIONS;
                 lpfc_els_rsp_reject(phba, stat.un.lsRjtError, cmdiocb, ndlp);
-                return (0);
+                return 0;
         }
         icmd = &cmdiocb->iocb;
 
@@ -362,7 +362,7 @@ lpfc_rcv_plogi(struct lpfc_hba * phba,
         case  NLP_STE_UNMAPPED_NODE:
         case  NLP_STE_MAPPED_NODE:
                 lpfc_els_rsp_acc(phba, ELS_CMD_PLOGI, cmdiocb, ndlp, NULL, 0);
-                return (1);
+                return 1;
         }
 
         if ((phba->fc_flag & FC_PT2PT)
@@ -409,13 +409,13 @@ lpfc_rcv_plogi(struct lpfc_hba * phba,
         }
         ndlp->nlp_flag |= NLP_RCV_PLOGI;
         lpfc_els_rsp_acc(phba, ELS_CMD_PLOGI, cmdiocb, ndlp, mbox, 0);
-        return (1);
+        return 1;
 
 out:
         stat.un.b.lsRjtRsnCode = LSRJT_UNABLE_TPC;
         stat.un.b.lsRjtRsnCodeExp = LSEXP_OUT_OF_RESOURCE;
         lpfc_els_rsp_reject(phba, stat.un.lsRjtError, cmdiocb, ndlp);
-        return (0);
+        return 0;
 }
 
 static int
@@ -456,7 +456,7 @@ lpfc_rcv_padisc(struct lpfc_hba * phba,
                         lpfc_els_rsp_acc(phba, ELS_CMD_PLOGI, cmdiocb, ndlp,
                                 NULL, 0);
                 }
-                return (1);
+                return 1;
         }
         /* Reject this request because invalid parameters */
         stat.un.b.lsRjtRsvd0 = 0;
@@ -474,7 +474,7 @@ lpfc_rcv_padisc(struct lpfc_hba * phba,
         spin_unlock_irq(phba->host->host_lock);
         ndlp->nlp_state = NLP_STE_NPR_NODE;
         lpfc_nlp_list(phba, ndlp, NLP_NPR_LIST);
-        return (0);
+        return 0;
 }
 
 static int
@@ -489,25 +489,31 @@ lpfc_rcv_logo(struct lpfc_hba * phba,
         ndlp->nlp_flag |= NLP_LOGO_ACC;
         lpfc_els_rsp_acc(phba, ELS_CMD_ACC, cmdiocb, ndlp, NULL, 0);
 
-        if (!(ndlp->nlp_type & NLP_FABRIC)) {
+        if (!(ndlp->nlp_type & NLP_FABRIC) ||
+                (ndlp->nlp_state == NLP_STE_ADISC_ISSUE)) {
                 /* Only try to re-login if this is NOT a Fabric Node */
                 ndlp->nlp_last_elscmd = (unsigned long)ELS_CMD_PLOGI;
                 mod_timer(&ndlp->nlp_delayfunc, jiffies + HZ * 1);
                 spin_lock_irq(phba->host->host_lock);
                 ndlp->nlp_flag |= NLP_DELAY_TMO;
                 spin_unlock_irq(phba->host->host_lock);
-        }
 
-        ndlp->nlp_state = NLP_STE_NPR_NODE;
-        lpfc_nlp_list(phba, ndlp, NLP_NPR_LIST);
+                ndlp->nlp_state = NLP_STE_NPR_NODE;
+                lpfc_nlp_list(phba, ndlp, NLP_NPR_LIST);
+        } else {
+                ndlp->nlp_state = NLP_STE_UNUSED_NODE;
+                lpfc_nlp_list(phba, ndlp, NLP_UNUSED_LIST);
+        }
 
+        spin_lock_irq(phba->host->host_lock);
         ndlp->nlp_flag &= ~NLP_NPR_ADISC;
+        spin_unlock_irq(phba->host->host_lock);
         /* The driver has to wait until the ACC completes before it continues
          * processing the LOGO.  The action will resume in
          * lpfc_cmpl_els_logo_acc routine. Since part of processing includes an
          * unreg_login, the driver waits so the ACC does not get aborted.
          */
-        return (0);
+        return 0;
 }
 
 static void
@@ -555,20 +561,12 @@ lpfc_disc_set_adisc(struct lpfc_hba * phba,
         if ((phba->cfg_use_adisc == 0) &&
                 !(phba->fc_flag & FC_RSCN_MODE)) {
                 if (!(ndlp->nlp_fcp_info & NLP_FCP_2_DEVICE))
-                        return (0);
+                        return 0;
         }
         spin_lock_irq(phba->host->host_lock);
         ndlp->nlp_flag |= NLP_NPR_ADISC;
         spin_unlock_irq(phba->host->host_lock);
-        return (1);
-}
-
-static uint32_t
-lpfc_disc_noop(struct lpfc_hba * phba,
-                struct lpfc_nodelist * ndlp, void *arg, uint32_t evt)
-{
-        /* This routine does nothing, just return the current state */
-        return (ndlp->nlp_state);
+        return 1;
 }
 
 static uint32_t
@@ -583,7 +581,7 @@ lpfc_disc_illegal(struct lpfc_hba * phba,
                         phba->brd_no,
                         ndlp->nlp_DID, evt, ndlp->nlp_state, ndlp->nlp_rpi,
                         ndlp->nlp_flag);
-        return (ndlp->nlp_state);
+        return ndlp->nlp_state;
 }
 
 /* Start of Discovery State Machine routines */
@@ -599,10 +597,10 @@ lpfc_rcv_plogi_unused_node(struct lpfc_hba * phba,
         if (lpfc_rcv_plogi(phba, ndlp, cmdiocb)) {
                 ndlp->nlp_state = NLP_STE_UNUSED_NODE;
                 lpfc_nlp_list(phba, ndlp, NLP_UNUSED_LIST);
-                return (ndlp->nlp_state);
+                return ndlp->nlp_state;
         }
         lpfc_nlp_list(phba, ndlp, NLP_NO_LIST);
-        return (NLP_STE_FREED_NODE);
+        return NLP_STE_FREED_NODE;
 }
 
 static uint32_t
@@ -611,7 +609,7 @@ lpfc_rcv_els_unused_node(struct lpfc_hba * phba,
 {
         lpfc_issue_els_logo(phba, ndlp, 0);
         lpfc_nlp_list(phba, ndlp, NLP_UNUSED_LIST);
-        return (ndlp->nlp_state);
+        return ndlp->nlp_state;
 }
 
 static uint32_t
@@ -628,7 +626,7 @@ lpfc_rcv_logo_unused_node(struct lpfc_hba * phba,
         lpfc_els_rsp_acc(phba, ELS_CMD_ACC, cmdiocb, ndlp, NULL, 0);
         lpfc_nlp_list(phba, ndlp, NLP_UNUSED_LIST);
 
-        return (ndlp->nlp_state);
+        return ndlp->nlp_state;
 }
 
 static uint32_t
@@ -636,7 +634,7 @@ lpfc_cmpl_logo_unused_node(struct lpfc_hba * phba,
                           struct lpfc_nodelist * ndlp, void *arg, uint32_t evt)
 {
         lpfc_nlp_list(phba, ndlp, NLP_NO_LIST);
-        return (NLP_STE_FREED_NODE);
+        return NLP_STE_FREED_NODE;
 }
 
 static uint32_t
@@ -644,7 +642,7 @@ lpfc_device_rm_unused_node(struct lpfc_hba * phba,
                            struct lpfc_nodelist * ndlp, void *arg, uint32_t evt)
 {
         lpfc_nlp_list(phba, ndlp, NLP_NO_LIST);
-        return (NLP_STE_FREED_NODE);
+        return NLP_STE_FREED_NODE;
 }
 
 static uint32_t
@@ -682,7 +680,22 @@ lpfc_rcv_plogi_plogi_issue(struct lpfc_hba * phba, struct lpfc_nodelist * ndlp,
                 lpfc_rcv_plogi(phba, ndlp, cmdiocb);
         } /* if our portname was less */
 
-        return (ndlp->nlp_state);
+        return ndlp->nlp_state;
+}
+
+static uint32_t
+lpfc_rcv_logo_plogi_issue(struct lpfc_hba * phba,
+                          struct lpfc_nodelist * ndlp, void *arg, uint32_t evt)
+{
+        struct lpfc_iocbq     *cmdiocb;
+
+        cmdiocb = (struct lpfc_iocbq *) arg;
+
+        /* software abort outstanding PLOGI */
+        lpfc_els_abort(phba, ndlp, 1);
+
+        lpfc_rcv_logo(phba, ndlp, cmdiocb);
+        return ndlp->nlp_state;
 }
 
 static uint32_t
@@ -712,7 +725,7 @@ lpfc_rcv_els_plogi_issue(struct lpfc_hba * phba,
         ndlp->nlp_state = NLP_STE_NPR_NODE;
         lpfc_nlp_list(phba, ndlp, NLP_NPR_LIST);
 
-        return (ndlp->nlp_state);
+        return ndlp->nlp_state;
 }
 
 static uint32_t
@@ -731,7 +744,7 @@ lpfc_cmpl_plogi_plogi_issue(struct lpfc_hba * phba,
         rspiocb = cmdiocb->context_un.rsp_iocb;
 
         if (ndlp->nlp_flag & NLP_ACC_REGLOGIN) {
-                return (ndlp->nlp_state);
+                return ndlp->nlp_state;
         }
 
         irsp = &rspiocb->iocb;
@@ -812,7 +825,7 @@ lpfc_cmpl_plogi_plogi_issue(struct lpfc_hba * phba,
                                 NLP_STE_REG_LOGIN_ISSUE;
                         lpfc_nlp_list(phba, ndlp,
                                       NLP_REGLOGIN_LIST);
-                        return (ndlp->nlp_state);
+                        return ndlp->nlp_state;
                 }
                 mempool_free(mbox, phba->mbox_mem_pool);
         } else {
@@ -824,7 +837,7 @@ lpfc_cmpl_plogi_plogi_issue(struct lpfc_hba * phba,
         /* Free this node since the driver cannot login or has the wrong
            sparm */
         lpfc_nlp_list(phba, ndlp, NLP_NO_LIST);
-        return (NLP_STE_FREED_NODE);
+        return NLP_STE_FREED_NODE;
 }
 
 static uint32_t
@@ -835,7 +848,7 @@ lpfc_device_rm_plogi_issue(struct lpfc_hba * phba,
         lpfc_els_abort(phba, ndlp, 1);
 
         lpfc_nlp_list(phba, ndlp, NLP_NO_LIST);
-        return (NLP_STE_FREED_NODE);
+        return NLP_STE_FREED_NODE;
 }
 
 static uint32_t
@@ -852,7 +865,7 @@ lpfc_device_recov_plogi_issue(struct lpfc_hba * phba,
         ndlp->nlp_flag &= ~NLP_NPR_2B_DISC;
         spin_unlock_irq(phba->host->host_lock);
 
-        return (ndlp->nlp_state);
+        return ndlp->nlp_state;
 }
 
 static uint32_t
@@ -868,13 +881,13 @@ lpfc_rcv_plogi_adisc_issue(struct lpfc_hba * phba,
         cmdiocb = (struct lpfc_iocbq *) arg;
 
         if (lpfc_rcv_plogi(phba, ndlp, cmdiocb)) {
-                return (ndlp->nlp_state);
+                return ndlp->nlp_state;
         }
         ndlp->nlp_state = NLP_STE_PLOGI_ISSUE;
         lpfc_nlp_list(phba, ndlp, NLP_PLOGI_LIST);
         lpfc_issue_els_plogi(phba, ndlp, 0);
 
-        return (ndlp->nlp_state);
+        return ndlp->nlp_state;
 }
 
 static uint32_t
@@ -887,7 +900,7 @@ lpfc_rcv_prli_adisc_issue(struct lpfc_hba * phba,
         cmdiocb = (struct lpfc_iocbq *) arg;
 
         lpfc_els_rsp_prli_acc(phba, cmdiocb, ndlp);
-        return (ndlp->nlp_state);
+        return ndlp->nlp_state;
 }
 
 static uint32_t
@@ -903,7 +916,7 @@ lpfc_rcv_logo_adisc_issue(struct lpfc_hba * phba,
         lpfc_els_abort(phba, ndlp, 0);
 
         lpfc_rcv_logo(phba, ndlp, cmdiocb);
-        return (ndlp->nlp_state);
+        return ndlp->nlp_state;
 }
 
 static uint32_t
@@ -916,7 +929,7 @@ lpfc_rcv_padisc_adisc_issue(struct lpfc_hba * phba,
         cmdiocb = (struct lpfc_iocbq *) arg;
 
         lpfc_rcv_padisc(phba, ndlp, cmdiocb);
-        return (ndlp->nlp_state);
+        return ndlp->nlp_state;
 }
 
 static uint32_t
@@ -930,7 +943,7 @@ lpfc_rcv_prlo_adisc_issue(struct lpfc_hba * phba,
 
         /* Treat like rcv logo */
         lpfc_rcv_logo(phba, ndlp, cmdiocb);
-        return (ndlp->nlp_state);
+        return ndlp->nlp_state;
 }
 
 static uint32_t
@@ -963,7 +976,7 @@ lpfc_cmpl_adisc_adisc_issue(struct lpfc_hba * phba,
                 ndlp->nlp_state = NLP_STE_NPR_NODE;
                 lpfc_nlp_list(phba, ndlp, NLP_NPR_LIST);
                 lpfc_unreg_rpi(phba, ndlp);
-                return (ndlp->nlp_state);
+                return ndlp->nlp_state;
         }
         if (ndlp->nlp_type & NLP_FCP_TARGET) {
                 ndlp->nlp_state = NLP_STE_MAPPED_NODE;
@@ -972,7 +985,7 @@ lpfc_cmpl_adisc_adisc_issue(struct lpfc_hba * phba,
                 ndlp->nlp_state = NLP_STE_UNMAPPED_NODE;
                 lpfc_nlp_list(phba, ndlp, NLP_UNMAPPED_LIST);
         }
-        return (ndlp->nlp_state);
+        return ndlp->nlp_state;
 }
 
 static uint32_t
@@ -984,7 +997,7 @@ lpfc_device_rm_adisc_issue(struct lpfc_hba * phba,
         lpfc_els_abort(phba, ndlp, 1);
 
         lpfc_nlp_list(phba, ndlp, NLP_NO_LIST);
-        return (NLP_STE_FREED_NODE);
+        return NLP_STE_FREED_NODE;
 }
 
 static uint32_t
@@ -999,10 +1012,10 @@ lpfc_device_recov_adisc_issue(struct lpfc_hba * phba,
         lpfc_nlp_list(phba, ndlp, NLP_NPR_LIST);
         spin_lock_irq(phba->host->host_lock);
         ndlp->nlp_flag &= ~NLP_NPR_2B_DISC;
+        ndlp->nlp_flag |= NLP_NPR_ADISC;
         spin_unlock_irq(phba->host->host_lock);
 
-        lpfc_disc_set_adisc(phba, ndlp);
-        return (ndlp->nlp_state);
+        return ndlp->nlp_state;
 }
 
 static uint32_t
@@ -1015,7 +1028,7 @@ lpfc_rcv_plogi_reglogin_issue(struct lpfc_hba * phba,
         cmdiocb = (struct lpfc_iocbq *) arg;
 
         lpfc_rcv_plogi(phba, ndlp, cmdiocb);
-        return (ndlp->nlp_state);
+        return ndlp->nlp_state;
 }
 
 static uint32_t
@@ -1028,7 +1041,7 @@ lpfc_rcv_prli_reglogin_issue(struct lpfc_hba * phba,
         cmdiocb = (struct lpfc_iocbq *) arg;
 
         lpfc_els_rsp_prli_acc(phba, cmdiocb, ndlp);
-        return (ndlp->nlp_state);
+        return ndlp->nlp_state;
 }
 
 static uint32_t
@@ -1041,7 +1054,7 @@ lpfc_rcv_logo_reglogin_issue(struct lpfc_hba * phba,
         cmdiocb = (struct lpfc_iocbq *) arg;
 
         lpfc_rcv_logo(phba, ndlp, cmdiocb);
-        return (ndlp->nlp_state);
+        return ndlp->nlp_state;
 }
 
 static uint32_t
@@ -1054,7 +1067,7 @@ lpfc_rcv_padisc_reglogin_issue(struct lpfc_hba * phba,
         cmdiocb = (struct lpfc_iocbq *) arg;
 
         lpfc_rcv_padisc(phba, ndlp, cmdiocb);
-        return (ndlp->nlp_state);
+        return ndlp->nlp_state;
 }
 
 static uint32_t
@@ -1066,7 +1079,7 @@ lpfc_rcv_prlo_reglogin_issue(struct lpfc_hba * phba,
 
         cmdiocb = (struct lpfc_iocbq *) arg;
         lpfc_els_rsp_acc(phba, ELS_CMD_ACC, cmdiocb, ndlp, NULL, 0);
-        return (ndlp->nlp_state);
+        return ndlp->nlp_state;
 }
 
 static uint32_t
@@ -1100,7 +1113,7 @@ lpfc_cmpl_reglogin_reglogin_issue(struct lpfc_hba * phba,
                 ndlp->nlp_last_elscmd = (unsigned long)ELS_CMD_PLOGI;
                 ndlp->nlp_state = NLP_STE_NPR_NODE;
                 lpfc_nlp_list(phba, ndlp, NLP_NPR_LIST);
-                return (ndlp->nlp_state);
+                return ndlp->nlp_state;
         }
 
         ndlp->nlp_rpi = mb->un.varWords[0];
@@ -1114,7 +1127,7 @@ lpfc_cmpl_reglogin_reglogin_issue(struct lpfc_hba * phba,
                 ndlp->nlp_state = NLP_STE_UNMAPPED_NODE;
                 lpfc_nlp_list(phba, ndlp, NLP_UNMAPPED_LIST);
         }
-        return (ndlp->nlp_state);
+        return ndlp->nlp_state;
 }
 
 static uint32_t
@@ -1123,7 +1136,7 @@ lpfc_device_rm_reglogin_issue(struct lpfc_hba * phba,
                               uint32_t evt)
 {
         lpfc_nlp_list(phba, ndlp, NLP_NO_LIST);
-        return (NLP_STE_FREED_NODE);
+        return NLP_STE_FREED_NODE;
 }
 
 static uint32_t
@@ -1136,7 +1149,7 @@ lpfc_device_recov_reglogin_issue(struct lpfc_hba * phba,
         spin_lock_irq(phba->host->host_lock);
         ndlp->nlp_flag &= ~NLP_NPR_2B_DISC;
         spin_unlock_irq(phba->host->host_lock);
-        return (ndlp->nlp_state);
+        return ndlp->nlp_state;
 }
 
 static uint32_t
@@ -1148,7 +1161,7 @@ lpfc_rcv_plogi_prli_issue(struct lpfc_hba * phba,
         cmdiocb = (struct lpfc_iocbq *) arg;
 
         lpfc_rcv_plogi(phba, ndlp, cmdiocb);
-        return (ndlp->nlp_state);
+        return ndlp->nlp_state;
 }
 
 static uint32_t
@@ -1160,7 +1173,7 @@ lpfc_rcv_prli_prli_issue(struct lpfc_hba * phba,
         cmdiocb = (struct lpfc_iocbq *) arg;
 
         lpfc_els_rsp_prli_acc(phba, cmdiocb, ndlp);
-        return (ndlp->nlp_state);
+        return ndlp->nlp_state;
 }
 
 static uint32_t
@@ -1175,7 +1188,7 @@ lpfc_rcv_logo_prli_issue(struct lpfc_hba * phba,
         lpfc_els_abort(phba, ndlp, 1);
 
         lpfc_rcv_logo(phba, ndlp, cmdiocb);
-        return (ndlp->nlp_state);
+        return ndlp->nlp_state;
 }
 
 static uint32_t
@@ -1187,7 +1200,7 @@ lpfc_rcv_padisc_prli_issue(struct lpfc_hba * phba,
         cmdiocb = (struct lpfc_iocbq *) arg;
 
         lpfc_rcv_padisc(phba, ndlp, cmdiocb);
-        return (ndlp->nlp_state);
+        return ndlp->nlp_state;
 }
 
 /* This routine is envoked when we rcv a PRLO request from a nport
@@ -1203,7 +1216,7 @@ lpfc_rcv_prlo_prli_issue(struct lpfc_hba * phba,
 
         cmdiocb = (struct lpfc_iocbq *) arg;
         lpfc_els_rsp_acc(phba, ELS_CMD_ACC, cmdiocb, ndlp, NULL, 0);
-        return (ndlp->nlp_state);
+        return ndlp->nlp_state;
 }
 
 static uint32_t
@@ -1222,7 +1235,7 @@ lpfc_cmpl_prli_prli_issue(struct lpfc_hba * phba,
         if (irsp->ulpStatus) {
                 ndlp->nlp_state = NLP_STE_UNMAPPED_NODE;
                 lpfc_nlp_list(phba, ndlp, NLP_UNMAPPED_LIST);
-                return (ndlp->nlp_state);
+                return ndlp->nlp_state;
         }
 
         /* Check out PRLI rsp */
@@ -1240,7 +1253,7 @@ lpfc_cmpl_prli_prli_issue(struct lpfc_hba * phba,
 
         ndlp->nlp_state = NLP_STE_MAPPED_NODE;
         lpfc_nlp_list(phba, ndlp, NLP_MAPPED_LIST);
-        return (ndlp->nlp_state);
+        return ndlp->nlp_state;
 }
 
 /*! lpfc_device_rm_prli_issue
@@ -1268,7 +1281,7 @@ lpfc_device_rm_prli_issue(struct lpfc_hba * phba,
         lpfc_els_abort(phba, ndlp, 1);
 
         lpfc_nlp_list(phba, ndlp, NLP_NO_LIST);
-        return (NLP_STE_FREED_NODE);
+        return NLP_STE_FREED_NODE;
 }
 
 
@@ -1300,7 +1313,7 @@ lpfc_device_recov_prli_issue(struct lpfc_hba * phba,
         spin_lock_irq(phba->host->host_lock);
         ndlp->nlp_flag &= ~NLP_NPR_2B_DISC;
         spin_unlock_irq(phba->host->host_lock);
-        return (ndlp->nlp_state);
+        return ndlp->nlp_state;
 }
 
 static uint32_t
@@ -1312,7 +1325,7 @@ lpfc_rcv_plogi_unmap_node(struct lpfc_hba * phba,
         cmdiocb = (struct lpfc_iocbq *) arg;
 
         lpfc_rcv_plogi(phba, ndlp, cmdiocb);
-        return (ndlp->nlp_state);
+        return ndlp->nlp_state;
 }
 
 static uint32_t
@@ -1325,7 +1338,7 @@ lpfc_rcv_prli_unmap_node(struct lpfc_hba * phba,
 
         lpfc_rcv_prli(phba, ndlp, cmdiocb);
         lpfc_els_rsp_prli_acc(phba, cmdiocb, ndlp);
-        return (ndlp->nlp_state);
+        return ndlp->nlp_state;
 }
 
 static uint32_t
@@ -1337,7 +1350,7 @@ lpfc_rcv_logo_unmap_node(struct lpfc_hba * phba,
         cmdiocb = (struct lpfc_iocbq *) arg;
 
         lpfc_rcv_logo(phba, ndlp, cmdiocb);
-        return (ndlp->nlp_state);
+        return ndlp->nlp_state;
 }
 
 static uint32_t
@@ -1349,7 +1362,7 @@ lpfc_rcv_padisc_unmap_node(struct lpfc_hba * phba,
         cmdiocb = (struct lpfc_iocbq *) arg;
 
         lpfc_rcv_padisc(phba, ndlp, cmdiocb);
-        return (ndlp->nlp_state);
+        return ndlp->nlp_state;
 }
 
 static uint32_t
@@ -1360,9 +1373,8 @@ lpfc_rcv_prlo_unmap_node(struct lpfc_hba * phba,
 
         cmdiocb = (struct lpfc_iocbq *) arg;
 
-        /* Treat like rcv logo */
-        lpfc_rcv_logo(phba, ndlp, cmdiocb);
-        return (ndlp->nlp_state);
+        lpfc_els_rsp_acc(phba, ELS_CMD_ACC, cmdiocb, ndlp, NULL, 0);
+        return ndlp->nlp_state;
 }
 
 static uint32_t
@@ -1374,7 +1386,7 @@ lpfc_device_recov_unmap_node(struct lpfc_hba * phba,
         ndlp->nlp_flag &= ~NLP_NPR_2B_DISC;
         lpfc_disc_set_adisc(phba, ndlp);
 
-        return (ndlp->nlp_state);
+        return ndlp->nlp_state;
 }
 
 static uint32_t
@@ -1386,7 +1398,7 @@ lpfc_rcv_plogi_mapped_node(struct lpfc_hba * phba,
         cmdiocb = (struct lpfc_iocbq *) arg;
 
         lpfc_rcv_plogi(phba, ndlp, cmdiocb);
-        return (ndlp->nlp_state);
+        return ndlp->nlp_state;
 }
 
 static uint32_t
@@ -1398,7 +1410,7 @@ lpfc_rcv_prli_mapped_node(struct lpfc_hba * phba,
         cmdiocb = (struct lpfc_iocbq *) arg;
 
         lpfc_els_rsp_prli_acc(phba, cmdiocb, ndlp);
-        return (ndlp->nlp_state);
+        return ndlp->nlp_state;
 }
 
 static uint32_t
@@ -1410,7 +1422,7 @@ lpfc_rcv_logo_mapped_node(struct lpfc_hba * phba,
         cmdiocb = (struct lpfc_iocbq *) arg;
 
         lpfc_rcv_logo(phba, ndlp, cmdiocb);
-        return (ndlp->nlp_state);
+        return ndlp->nlp_state;
 }
 
 static uint32_t
@@ -1423,7 +1435,7 @@ lpfc_rcv_padisc_mapped_node(struct lpfc_hba * phba,
         cmdiocb = (struct lpfc_iocbq *) arg;
 
         lpfc_rcv_padisc(phba, ndlp, cmdiocb);
-        return (ndlp->nlp_state);
+        return ndlp->nlp_state;
 }
 
 static uint32_t
@@ -1442,7 +1454,7 @@ lpfc_rcv_prlo_mapped_node(struct lpfc_hba * phba,
 
         /* Treat like rcv logo */
         lpfc_rcv_logo(phba, ndlp, cmdiocb);
-        return (ndlp->nlp_state);
+        return ndlp->nlp_state;
 }
 
 static uint32_t
@@ -1456,7 +1468,7 @@ lpfc_device_recov_mapped_node(struct lpfc_hba * phba,
         ndlp->nlp_flag &= ~NLP_NPR_2B_DISC;
         spin_unlock_irq(phba->host->host_lock);
         lpfc_disc_set_adisc(phba, ndlp);
-        return (ndlp->nlp_state);
+        return ndlp->nlp_state;
 }
 
 static uint32_t
@@ -1470,14 +1482,14 @@ lpfc_rcv_plogi_npr_node(struct lpfc_hba * phba,
 
         /* Ignore PLOGI if we have an outstanding LOGO */
         if (ndlp->nlp_flag & NLP_LOGO_SND) {
-                return (ndlp->nlp_state);
+                return ndlp->nlp_state;
         }
 
         if (lpfc_rcv_plogi(phba, ndlp, cmdiocb)) {
                 spin_lock_irq(phba->host->host_lock);
                 ndlp->nlp_flag &= ~(NLP_NPR_ADISC | NLP_NPR_2B_DISC);
                 spin_unlock_irq(phba->host->host_lock);
-                return (ndlp->nlp_state);
+                return ndlp->nlp_state;
         }
 
         /* send PLOGI immediately, move to PLOGI issue state */
@@ -1486,7 +1498,7 @@ lpfc_rcv_plogi_npr_node(struct lpfc_hba * phba,
                         lpfc_nlp_list(phba, ndlp, NLP_PLOGI_LIST);
                         lpfc_issue_els_plogi(phba, ndlp, 0);
         }
-        return (ndlp->nlp_state);
+        return ndlp->nlp_state;
 }
 
 static uint32_t
@@ -1506,6 +1518,9 @@ lpfc_rcv_prli_npr_node(struct lpfc_hba * phba,
 
         if (!(ndlp->nlp_flag & NLP_DELAY_TMO)) {
                 if (ndlp->nlp_flag & NLP_NPR_ADISC) {
+                        spin_lock_irq(phba->host->host_lock);
+                        ndlp->nlp_flag &= ~NLP_NPR_ADISC;
+                        spin_unlock_irq(phba->host->host_lock);
                         ndlp->nlp_state = NLP_STE_ADISC_ISSUE;
                         lpfc_nlp_list(phba, ndlp, NLP_ADISC_LIST);
                         lpfc_issue_els_adisc(phba, ndlp, 0);
@@ -1515,7 +1530,7 @@ lpfc_rcv_prli_npr_node(struct lpfc_hba * phba,
                         lpfc_issue_els_plogi(phba, ndlp, 0);
                 }
         }
-        return (ndlp->nlp_state);
+        return ndlp->nlp_state;
 }
 
 static uint32_t
@@ -1528,7 +1543,7 @@ lpfc_rcv_logo_npr_node(struct lpfc_hba * phba,
         cmdiocb = (struct lpfc_iocbq *) arg;
 
         lpfc_rcv_logo(phba, ndlp, cmdiocb);
-        return (ndlp->nlp_state);
+        return ndlp->nlp_state;
 }
 
 static uint32_t
@@ -1553,7 +1568,7 @@ lpfc_rcv_padisc_npr_node(struct lpfc_hba * phba,
                         lpfc_issue_els_plogi(phba, ndlp, 0);
                 }
         }
-        return (ndlp->nlp_state);
+        return ndlp->nlp_state;
 }
 
 static uint32_t
@@ -1565,25 +1580,46 @@ lpfc_rcv_prlo_npr_node(struct lpfc_hba * phba,
 
         cmdiocb = (struct lpfc_iocbq *) arg;
 
+        spin_lock_irq(phba->host->host_lock);
+        ndlp->nlp_flag |= NLP_LOGO_ACC;
+        spin_unlock_irq(phba->host->host_lock);
+
         lpfc_els_rsp_acc(phba, ELS_CMD_ACC, cmdiocb, ndlp, NULL, 0);
 
-        if (ndlp->nlp_flag & NLP_DELAY_TMO) {
-                if (ndlp->nlp_last_elscmd == (unsigned long)ELS_CMD_PLOGI) {
-                        return (ndlp->nlp_state);
-                } else {
-                        spin_lock_irq(phba->host->host_lock);
-                        ndlp->nlp_flag &= ~NLP_DELAY_TMO;
-                        spin_unlock_irq(phba->host->host_lock);
-                        del_timer_sync(&ndlp->nlp_delayfunc);
-                        if (!list_empty(&ndlp->els_retry_evt.evt_listp))
-                                list_del_init(&ndlp->els_retry_evt.evt_listp);
-                }
+        if (!(ndlp->nlp_flag & NLP_DELAY_TMO)) {
+                mod_timer(&ndlp->nlp_delayfunc, jiffies + HZ * 1);
+                spin_lock_irq(phba->host->host_lock);
+                ndlp->nlp_flag |= NLP_DELAY_TMO;
+                ndlp->nlp_flag &= ~NLP_NPR_ADISC;
+                spin_unlock_irq(phba->host->host_lock);
+        } else {
+                spin_lock_irq(phba->host->host_lock);
+                ndlp->nlp_flag &= ~NLP_NPR_ADISC;
+                spin_unlock_irq(phba->host->host_lock);
         }
+        return ndlp->nlp_state;
+}
 
-        ndlp->nlp_state = NLP_STE_PLOGI_ISSUE;
-        lpfc_nlp_list(phba, ndlp, NLP_PLOGI_LIST);
-        lpfc_issue_els_plogi(phba, ndlp, 0);
-        return (ndlp->nlp_state);
+static uint32_t
+lpfc_cmpl_plogi_npr_node(struct lpfc_hba * phba,
+                          struct lpfc_nodelist * ndlp, void *arg, uint32_t evt)
+{
+        struct lpfc_iocbq *cmdiocb, *rspiocb;
+
+        cmdiocb = (struct lpfc_iocbq *) arg;
+        rspiocb = cmdiocb->context_un.rsp_iocb;
+        return ndlp->nlp_state;
+}
+
+static uint32_t
+lpfc_cmpl_prli_npr_node(struct lpfc_hba * phba,
+                          struct lpfc_nodelist * ndlp, void *arg, uint32_t evt)
+{
+        struct lpfc_iocbq *cmdiocb, *rspiocb;
+
+        cmdiocb = (struct lpfc_iocbq *) arg;
+        rspiocb = cmdiocb->context_un.rsp_iocb;
+        return ndlp->nlp_state;
 }
 
 static uint32_t
@@ -1592,7 +1628,19 @@ lpfc_cmpl_logo_npr_node(struct lpfc_hba * phba,
 {
         lpfc_unreg_rpi(phba, ndlp);
         /* This routine does nothing, just return the current state */
-        return (ndlp->nlp_state);
+        return ndlp->nlp_state;
+}
+
+static uint32_t
+lpfc_cmpl_adisc_npr_node(struct lpfc_hba * phba,
+                            struct lpfc_nodelist * ndlp, void *arg,
+                            uint32_t evt)
+{
+        struct lpfc_iocbq *cmdiocb, *rspiocb;
+
+        cmdiocb = (struct lpfc_iocbq *) arg;
+        rspiocb = cmdiocb->context_un.rsp_iocb;
+        return ndlp->nlp_state;
 }
 
 static uint32_t
@@ -1606,9 +1654,10 @@ lpfc_cmpl_reglogin_npr_node(struct lpfc_hba * phba,
         pmb = (LPFC_MBOXQ_t *) arg;
         mb = &pmb->mb;
 
-        ndlp->nlp_rpi = mb->un.varWords[0];
+        if (!mb->mbxStatus)
+                ndlp->nlp_rpi = mb->un.varWords[0];
 
-        return (ndlp->nlp_state);
+        return ndlp->nlp_state;
 }
 
 static uint32_t
@@ -1617,7 +1666,7 @@ lpfc_device_rm_npr_node(struct lpfc_hba * phba,
                             uint32_t evt)
 {
         lpfc_nlp_list(phba, ndlp, NLP_NO_LIST);
-        return (NLP_STE_FREED_NODE);
+        return NLP_STE_FREED_NODE;
 }
 
 static uint32_t
@@ -1633,10 +1682,10 @@ lpfc_device_recov_npr_node(struct lpfc_hba * phba,
                         list_del_init(&ndlp->els_retry_evt.evt_listp);
                 spin_unlock_irq(phba->host->host_lock);
                 del_timer_sync(&ndlp->nlp_delayfunc);
-                return (ndlp->nlp_state);
+                return ndlp->nlp_state;
         }
         spin_unlock_irq(phba->host->host_lock);
-        return (ndlp->nlp_state);
+        return ndlp->nlp_state;
 }
 
 
@@ -1715,7 +1764,7 @@ static uint32_t (*lpfc_disc_action[NLP_STE_MAX_STATE * NLP_EVT_MAX_EVENT])
 
         lpfc_rcv_plogi_plogi_issue,     /* RCV_PLOGI   PLOGI_ISSUE    */
         lpfc_rcv_els_plogi_issue,       /* RCV_PRLI        */
-        lpfc_rcv_els_plogi_issue,       /* RCV_LOGO        */
+        lpfc_rcv_logo_plogi_issue,      /* RCV_LOGO        */
         lpfc_rcv_els_plogi_issue,       /* RCV_ADISC       */
         lpfc_rcv_els_plogi_issue,       /* RCV_PDISC       */
         lpfc_rcv_els_plogi_issue,       /* RCV_PRLO        */
@@ -1803,10 +1852,10 @@ static uint32_t (*lpfc_disc_action[NLP_STE_MAX_STATE * NLP_EVT_MAX_EVENT])
         lpfc_rcv_padisc_npr_node,       /* RCV_ADISC       */
         lpfc_rcv_padisc_npr_node,       /* RCV_PDISC       */
         lpfc_rcv_prlo_npr_node,         /* RCV_PRLO        */
-        lpfc_disc_noop,                 /* CMPL_PLOGI      */
-        lpfc_disc_noop,                 /* CMPL_PRLI       */
+        lpfc_cmpl_plogi_npr_node,       /* CMPL_PLOGI      */
+        lpfc_cmpl_prli_npr_node,        /* CMPL_PRLI       */
         lpfc_cmpl_logo_npr_node,        /* CMPL_LOGO       */
-        lpfc_disc_noop,                 /* CMPL_ADISC      */
+        lpfc_cmpl_adisc_npr_node,       /* CMPL_ADISC      */
         lpfc_cmpl_reglogin_npr_node,    /* CMPL_REG_LOGIN  */
         lpfc_device_rm_npr_node,        /* DEVICE_RM       */
         lpfc_device_recov_npr_node,     /* DEVICE_RECOVERY */
@@ -1852,10 +1901,10 @@ lpfc_disc_state_machine(struct lpfc_hba * phba,
                 ndlp->nlp_flag &= ~NLP_DELAY_REMOVE;
                 spin_unlock_irq(phba->host->host_lock);
                 lpfc_nlp_remove(phba, ndlp);
-                return (NLP_STE_FREED_NODE);
+                return NLP_STE_FREED_NODE;
         }
         if (rc == NLP_STE_FREED_NODE)
-                return (NLP_STE_FREED_NODE);
+                return NLP_STE_FREED_NODE;
         ndlp->nlp_state = rc;
-        return (rc);
+        return rc;
 }