[SCSI] lpfc 8.3.31: Fix bug with driver using the wrong xritag when sending an els echo
Signed-off-by: Alex Iannicelli <alex.iannicelli@emulex.com> Signed-off-by: James Smart <james.smart@emulex.com> Signed-off-by: James Bottomley <JBottomley@Parallels.com>
This commit is contained in:
parent
809c75368d
commit
93d1379e69
|
@ -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;
|
||||
|
|
|
@ -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,7 +7871,10 @@ lpfc_sli4_iocb2wqe(struct lpfc_hba *phba, struct lpfc_iocbq *iocbq,
|
|||
|
||||
switch (iocbq->iocb.ulpCommand) {
|
||||
case CMD_ELS_REQUEST64_CR:
|
||||
ndlp = (struct lpfc_nodelist *)iocbq->context1;
|
||||
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,
|
||||
"2007 Only Limited Edition cmd Format"
|
||||
|
|
Loading…
Reference in New Issue