Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 93d1379e authored by James Smart's avatar James Smart Committed by James Bottomley
Browse files

[SCSI] lpfc 8.3.31: Fix bug with driver using the wrong xritag when sending an els echo 



Signed-off-by: default avatarAlex Iannicelli <alex.iannicelli@emulex.com>
Signed-off-by: default avatarJames Smart <james.smart@emulex.com>
Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com>
parent 809c7536

drivers/scsi/lpfc/lpfc_bsg.c

+1 −0
Original line number Diff line number Diff line
@@ -599,6 +599,7 @@ lpfc_bsg_rport_els(struct fc_bsg_job *job) 


	cmdiocbq->iocb_cmpl = lpfc_bsg_rport_els_cmp;

	cmdiocbq->context1 = dd_data;

	cmdiocbq->context_un.ndlp = ndlp;

	cmdiocbq->context2 = rspiocbq;

	dd_data->type = TYPE_IOCB;

	dd_data->context_un.iocb.cmdiocbq = cmdiocbq;

drivers/scsi/lpfc/lpfc_sli.c

+7 −1
Original line number Diff line number Diff line
@@ -877,6 +877,9 @@ __lpfc_sli_get_sglq(struct lpfc_hba *phba, struct lpfc_iocbq *piocbq) 
	} else  if ((piocbq->iocb.ulpCommand == CMD_GEN_REQUEST64_CR) &&

			!(piocbq->iocb_flag & LPFC_IO_LIBDFC))

		ndlp = piocbq->context_un.ndlp;

	else  if ((piocbq->iocb.ulpCommand == CMD_ELS_REQUEST64_CR) &&

			(piocbq->iocb_flag & LPFC_IO_LIBDFC))

		ndlp = piocbq->context_un.ndlp;

	else

		ndlp = piocbq->context1;
@@ -7868,6 +7871,9 @@ lpfc_sli4_iocb2wqe(struct lpfc_hba *phba, struct lpfc_iocbq *iocbq, 


	switch (iocbq->iocb.ulpCommand) {

	case CMD_ELS_REQUEST64_CR:

		if (iocbq->iocb_flag & LPFC_IO_LIBDFC)

			ndlp = iocbq->context_un.ndlp;

		else

			ndlp = (struct lpfc_nodelist *)iocbq->context1;

		if (!iocbq->iocb.ulpLe) {

			lpfc_printf_log(phba, KERN_ERR, LOG_SLI,