1 files changed, 4 insertions, 17 deletions

diff --git a/drivers/scsi/lpfc/lpfc_nportdisc.c b/drivers/scsi/lpfc/lpfc_nportdisc.c
index 9b35eaac781d..507a6af56f42 100644
--- a/drivers/scsi/lpfc/lpfc_nportdisc.c
+++ b/drivers/scsi/lpfc/lpfc_nportdisc.c
@@ -187,10 +187,8 @@ lpfc_els_abort(struct lpfc_hba * phba, struct lpfc_nodelist * ndlp,
                                         spin_unlock_irq(phba->host->host_lock);
                                         (iocb->iocb_cmpl) (phba, iocb, iocb);
                                         spin_lock_irq(phba->host->host_lock);
-                                } else {
-                                        list_add_tail(&iocb->list,
-                                                        &phba->lpfc_iocb_list);
-                                }
+                                } else
+                                        lpfc_sli_release_iocbq(phba, iocb);
                                 break;
                         }
                 }
@@ -232,10 +230,8 @@ lpfc_els_abort(struct lpfc_hba * phba, struct lpfc_nodelist * ndlp,
                                         spin_unlock_irq(phba->host->host_lock);
                                         (iocb->iocb_cmpl) (phba, iocb, iocb);
                                         spin_lock_irq(phba->host->host_lock);
-                                } else {
-                                        list_add_tail(&iocb->list,
-                                                        &phba->lpfc_iocb_list);
-                                }
+                                } else
+                                        lpfc_sli_release_iocbq(phba, iocb);
                                 break;
                         }
                 }
@@ -1086,11 +1082,7 @@ lpfc_cmpl_reglogin_reglogin_issue(struct lpfc_hba * phba,
                 return (ndlp->nlp_state);
         }
 
-        if (ndlp->nlp_rpi != 0)
-                lpfc_findnode_remove_rpi(phba, ndlp->nlp_rpi);
-
         ndlp->nlp_rpi = mb->un.varWords[0];
-        lpfc_addnode_rpi(phba, ndlp, ndlp->nlp_rpi);
 
         /* Only if we are not a fabric nport do we issue PRLI */
         if (!(ndlp->nlp_type & NLP_FABRIC)) {
@@ -1593,12 +1585,7 @@ lpfc_cmpl_reglogin_npr_node(struct lpfc_hba * phba,
         pmb = (LPFC_MBOXQ_t *) arg;
         mb = &pmb->mb;
 
-        /* save rpi */
-        if (ndlp->nlp_rpi != 0)
-                lpfc_findnode_remove_rpi(phba, ndlp->nlp_rpi);
-
         ndlp->nlp_rpi = mb->un.varWords[0];
-        lpfc_addnode_rpi(phba, ndlp, ndlp->nlp_rpi);
 
         return (ndlp->nlp_state);
 }