From 00827a879c874aebca973ca18ecf9a6b9fe404cb Mon Sep 17 00:00:00 2001 From: James Smart Date: Sat, 29 Sep 2012 11:31:11 -0400 Subject: [PATCH] --- yaml --- r: 334123 b: refs/heads/master c: 4c1b64bad4755e66c649c89653dadb0206c7b30a h: refs/heads/master i: 334121: 0539be4977049fed5e9bcdc26993d85b593ac5e5 334119: a85762d47a5e5a45a5c84061831e3a72d39d113a v: v3 --- [refs] | 2 +- trunk/drivers/scsi/lpfc/lpfc_els.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index f7b3a7ab6f79..07d74be4bd53 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ce3962829d750fd64ff1317e8b82134f1f152eeb +refs/heads/master: 4c1b64bad4755e66c649c89653dadb0206c7b30a diff --git a/trunk/drivers/scsi/lpfc/lpfc_els.c b/trunk/drivers/scsi/lpfc/lpfc_els.c index cfe533bc9790..c23f6415f76d 100644 --- a/trunk/drivers/scsi/lpfc/lpfc_els.c +++ b/trunk/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);