From 5dcc1a7392a25fa6cd340f9fefd4cb3a9a92df0d Mon Sep 17 00:00:00 2001
From: James Smart <James.Smart@Emulex.Com>
Date: Thu, 6 Jul 2006 15:49:42 -0400
Subject: [PATCH] --- yaml --- r: 32727 b: refs/heads/master c:
 d0e56dad5c10e2a34a830e02dfd3aca20e63e387 h: refs/heads/master i:   32725:
 9b65ae9959b921f725a0de2193b531fa56f06b78   32723:
 78fee5193226638bd53da03b3dae1058722f3d0b   32719:
 01446fb1e3dc74bb2be623a0be8be085506d8f25 v: v3

---
 [refs]                                   |  2 +-
 trunk/drivers/scsi/lpfc/lpfc_nportdisc.c | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 1296bae662d0..b504f2238d9a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9f49d3b05f092b89e774be20c654ceb0c64a7d19
+refs/heads/master: d0e56dad5c10e2a34a830e02dfd3aca20e63e387
diff --git a/trunk/drivers/scsi/lpfc/lpfc_nportdisc.c b/trunk/drivers/scsi/lpfc/lpfc_nportdisc.c
index 27d60ad897cd..bd0b0e293d63 100644
--- a/trunk/drivers/scsi/lpfc/lpfc_nportdisc.c
+++ b/trunk/drivers/scsi/lpfc/lpfc_nportdisc.c
@@ -1110,6 +1110,17 @@ lpfc_cmpl_reglogin_reglogin_issue(struct lpfc_hba * phba,
 				phba->brd_no,
 				did, mb->mbxStatus, phba->hba_state);
 
+		/*
+		 * If RegLogin failed due to lack of HBA resources do not
+		 * retry discovery.
+		 */
+		if (mb->mbxStatus == MBXERR_RPI_FULL) {
+			ndlp->nlp_prev_state = NLP_STE_UNUSED_NODE;
+			ndlp->nlp_state = NLP_STE_UNUSED_NODE;
+			lpfc_nlp_list(phba, ndlp, NLP_UNUSED_LIST);
+			return ndlp->nlp_state;
+		}
+
 		/* Put ndlp in npr list set plogi timer for 1 sec */
 		mod_timer(&ndlp->nlp_delayfunc, jiffies + HZ * 1);
 		spin_lock_irq(phba->host->host_lock);