1 files changed, 5 insertions, 11 deletions

diff --git a/drivers/scsi/lpfc/lpfc_nportdisc.c b/drivers/scsi/lpfc/lpfc_nportdisc.c
index bccc9c66fa3..d85a7423a69 100644
--- a/drivers/scsi/lpfc/lpfc_nportdisc.c
+++ b/drivers/scsi/lpfc/lpfc_nportdisc.c
@@ -386,7 +386,7 @@ lpfc_rcv_plogi(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
                 goto out;
 
         rc = lpfc_reg_rpi(phba, vport->vpi, icmd->un.rcvels.remoteID,
-                            (uint8_t *) sp, mbox, 0);
+                            (uint8_t *) sp, mbox, ndlp->nlp_rpi);
         if (rc) {
                 mempool_free(mbox, phba->mbox_mem_pool);
                 goto out;
@@ -632,7 +632,7 @@ lpfc_disc_set_adisc(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp)
 {
         struct Scsi_Host *shost = lpfc_shost_from_vport(vport);
 
-        if (!(ndlp->nlp_flag & NLP_RPI_VALID)) {
+        if (!(ndlp->nlp_flag & NLP_RPI_REGISTERED)) {
                 ndlp->nlp_flag &= ~NLP_NPR_ADISC;
                 return 0;
         }
@@ -968,7 +968,7 @@ lpfc_cmpl_plogi_plogi_issue(struct lpfc_vport *vport,
         lpfc_unreg_rpi(vport, ndlp);
 
         if (lpfc_reg_rpi(phba, vport->vpi, irsp->un.elsreq64.remoteID,
-                           (uint8_t *) sp, mbox, 0) == 0) {
+                         (uint8_t *) sp, mbox, ndlp->nlp_rpi) == 0) {
                 switch (ndlp->nlp_DID) {
                 case NameServer_DID:
                         mbox->mbox_cmpl = lpfc_mbx_cmpl_ns_reg_login;
@@ -1338,12 +1338,6 @@ lpfc_rcv_logo_reglogin_issue(struct lpfc_vport *vport,
         list_for_each_entry_safe(mb, nextmb, &phba->sli.mboxq, list) {
                 if ((mb->u.mb.mbxCommand == MBX_REG_LOGIN64) &&
                    (ndlp == (struct lpfc_nodelist *) mb->context2)) {
-                        if (phba->sli_rev == LPFC_SLI_REV4) {
-                                spin_unlock_irq(&phba->hbalock);
-                                lpfc_sli4_free_rpi(phba,
-                                        mb->u.mb.un.varRegLogin.rpi);
-                                spin_lock_irq(&phba->hbalock);
-                        }
                         mp = (struct lpfc_dmabuf *) (mb->context1);
                         if (mp) {
                                 __lpfc_mbuf_free(phba, mp->virt, mp->phys);
@@ -1426,7 +1420,7 @@ lpfc_cmpl_reglogin_reglogin_issue(struct lpfc_vport *vport,
         }
 
         ndlp->nlp_rpi = mb->un.varWords[0];
-        ndlp->nlp_flag |= NLP_RPI_VALID;
+        ndlp->nlp_flag |= NLP_RPI_REGISTERED;
 
         /* Only if we are not a fabric nport do we issue PRLI */
         if (!(ndlp->nlp_type & NLP_FABRIC)) {
@@ -2027,7 +2021,7 @@ lpfc_cmpl_reglogin_npr_node(struct lpfc_vport *vport,
 
         if (!mb->mbxStatus) {
                 ndlp->nlp_rpi = mb->un.varWords[0];
-                ndlp->nlp_flag |= NLP_RPI_VALID;
+                ndlp->nlp_flag |= NLP_RPI_REGISTERED;
         } else {
                 if (ndlp->nlp_flag & NLP_NODEV_REMOVE) {
                         lpfc_drop_node(vport, ndlp);