2 files changed, 8 insertions, 1 deletions

diff --git a/drivers/scsi/lpfc/lpfc_bsg.c b/drivers/scsi/lpfc/lpfc_bsg.c
index 7d5641db5ee4..253d9a857346 100644
--- a/drivers/scsi/lpfc/lpfc_bsg.c
+++ b/drivers/scsi/lpfc/lpfc_bsg.c
@@ -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;
diff --git a/drivers/scsi/lpfc/lpfc_sli.c b/drivers/scsi/lpfc/lpfc_sli.c
index 70e4bc3a1a2d..832899410306 100644
--- 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;
 
@@ -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"