diff options
| author | James Smart <james.smart@emulex.com> | 2012-09-29 11:31:11 -0400 |
|---|---|---|
| committer | James Bottomley <JBottomley@Parallels.com> | 2012-10-08 12:03:43 +0100 |
| commit | 4c1b64bad4755e66c649c89653dadb0206c7b30a (patch) | |
| tree | 2a8e24c7bb31cc12e96110b5a383c48072c0e9d4 /drivers/scsi | |
| parent | ce3962829d750fd64ff1317e8b82134f1f152eeb (diff) | |
| download | op-kernel-dev-4c1b64bad4755e66c649c89653dadb0206c7b30a.zip op-kernel-dev-4c1b64bad4755e66c649c89653dadb0206c7b30a.tar.gz | |
[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>
Diffstat (limited to 'drivers/scsi')
| -rw-r--r-- | drivers/scsi/lpfc/lpfc_els.c | 5 |
1 files changed, 3 insertions, 2 deletions
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); |
