From: James Smart <james.smart@emulex.com>
Date: Sat, 29 Sep 2012 15:31:11 +0000 (-0400)
Subject: [SCSI] lpfc 8.3.35: Fixed PRLI not being retried if a LS_RJT with a reason
X-Git-Tag: upstream/snapshot3+hdmi~6442^2~21
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4c1b64bad4755e66c649c89653dadb0206c7b30a;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

[SCSI] lpfc 8.3.35: Fixed PRLI not being retried if a LS_RJT with a reason

Signed-off-by: James Smart <james.smart@emulex.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
---

diff --git a/drivers/scsi/lpfc/lpfc_els.c b/drivers/scsi/lpfc/lpfc_els.c
index cfe533b..c23f641 100644
--- a/drivers/scsi/lpfc/lpfc_els.c
+++ b/drivers/scsi/lpfc/lpfc_els.c
@@ -3160,7 +3160,8 @@ lpfc_els_retry(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,
 				retry = 1;
 				break;
 			}
-			if (cmd == ELS_CMD_PLOGI) {
+			if ((cmd == ELS_CMD_PLOGI) ||
+			    (cmd == ELS_CMD_PRLI)) {
 				delay = 1000;
 				maxretry = lpfc_max_els_tries + 1;
 				retry = 1;
@@ -3305,7 +3306,7 @@ lpfc_els_retry(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,
 			ndlp->nlp_prev_state = ndlp->nlp_state;
 			if (cmd == ELS_CMD_PRLI)
 				lpfc_nlp_set_state(vport, ndlp,
-					NLP_STE_REG_LOGIN_ISSUE);
+					NLP_STE_PRLI_ISSUE);
 			else
 				lpfc_nlp_set_state(vport, ndlp,
 					NLP_STE_NPR_NODE);