[SCSI] lpfc 8.3.29: BSG and User interface fixes

[deliverable/linux.git] / drivers / scsi / lpfc / lpfc_sli.c

diff --git a/drivers/scsi/lpfc/lpfc_sli.c b/drivers/scsi/lpfc/lpfc_sli.c
index 23a27592388cac6d7c72c9ee10163a54b5882a27..42ea367ddba7a350dc16504f002cba677eb9d270 100644 (file)
--- a/drivers/scsi/lpfc/lpfc_sli.c
+++ b/drivers/scsi/lpfc/lpfc_sli.c
@@ -7763,7 +7763,7 @@ lpfc_sli4_iocb2wqe(struct lpfc_hba *phba, struct lpfc_iocbq *iocbq,
                                bf_set(wqe_ct, &wqe->els_req.wqe_com, 1);
                                bf_set(wqe_ctxt_tag, &wqe->els_req.wqe_com,
                                        phba->vpi_ids[phba->pport->vpi]);
-                       } else if (iocbq->context1) {
+                       } else if (pcmd && iocbq->context1) {
                                bf_set(wqe_ct, &wqe->els_req.wqe_com, 0);
                                bf_set(wqe_ctxt_tag, &wqe->els_req.wqe_com,
                                        phba->sli4_hba.rpi_ids[ndlp->nlp_rpi]);