scsi/lpfc: Fix bug with driver using the wrong xritag when sending an els echo

commit id: 93d1379e6924daef1968779d97c46ba2e0915fd2

Signed-off-by: Jerry Snitselaar <jerry.snitselaar@oracle.com>

diff --git a/drivers/scsi/lpfc/lpfc_bsg.c b/drivers/scsi/lpfc/lpfc_bsg.c
index 39b4c8c843474790697c91cd9d408a2b3ba9fd3b..1773e0ff10542ecee897e6f3d2a20f2211730473 100644 (file)
--- a/drivers/scsi/lpfc/lpfc_bsg.c
+++ b/drivers/scsi/lpfc/lpfc_bsg.c
@@ -600,6 +600,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;

diff --git a/drivers/scsi/lpfc/lpfc_sli.c b/drivers/scsi/lpfc/lpfc_sli.c
index 7ce4ccd446b3c99f31a959290fb52cc060e784b5..048183d4fb109840a1d11a8b4293a70a9211da1d 100644 (file)
--- a/drivers/scsi/lpfc/lpfc_sli.c
+++ b/drivers/scsi/lpfc/lpfc_sli.c
@@ -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;
 
@@ -7863,7 +7866,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"