Skip to content

Commit aeaf117

Browse files
Justin Teemartinkpetersen
authored andcommitted
scsi: lpfc: Relax PRLI issue conditions after GID_FT response
If previously in REG_LOGIN_ISSUE state, then remove the requirement that PLOGI must have been received from the remote port before issuing a PRLI. After GID_FT completes, it does not matter whether the driver itself sent a PLOGI or received one. The fact that we're in REG_LOGIN_ISSUE state simply means that the next state should be issuing the PRLI to continue discovery of the remote port. Signed-off-by: Justin Tee <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Martin K. Petersen <[email protected]>
1 parent 9609385 commit aeaf117

File tree

1 file changed

+4
-12
lines changed

1 file changed

+4
-12
lines changed

drivers/scsi/lpfc/lpfc_ct.c

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1553,22 +1553,14 @@ lpfc_cmpl_ct_cmd_gft_id(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,
15531553
if (ndlp->nlp_state == NLP_STE_REG_LOGIN_ISSUE &&
15541554
ndlp->nlp_fc4_type) {
15551555
ndlp->nlp_prev_state = NLP_STE_REG_LOGIN_ISSUE;
1556-
/* This is a fabric topology so if discovery
1557-
* started with an unsolicited PLOGI, don't
1558-
* send a PRLI. Targets don't issue PLOGI or
1559-
* PRLI when acting as a target. Likely this is
1560-
* an initiator function.
1561-
*/
1562-
if (!(ndlp->nlp_flag & NLP_RCV_PLOGI)) {
1563-
lpfc_nlp_set_state(vport, ndlp,
1564-
NLP_STE_PRLI_ISSUE);
1565-
lpfc_issue_els_prli(vport, ndlp, 0);
1566-
}
1556+
lpfc_nlp_set_state(vport, ndlp,
1557+
NLP_STE_PRLI_ISSUE);
1558+
lpfc_issue_els_prli(vport, ndlp, 0);
15671559
} else if (!ndlp->nlp_fc4_type) {
15681560
/* If fc4 type is still unknown, then LOGO */
15691561
lpfc_printf_vlog(vport, KERN_INFO,
15701562
LOG_DISCOVERY | LOG_NODE,
1571-
"6443 Sending LOGO ndlp x%px,"
1563+
"6443 Sending LOGO ndlp x%px, "
15721564
"DID x%06x with fc4_type: "
15731565
"x%08x, state: %d\n",
15741566
ndlp, did, ndlp->nlp_fc4_type,

0 commit comments

Comments
 (0)