diff options
author | James Smart <james.smart@emulex.com> | 2012-05-09 21:19:34 -0400 |
---|---|---|
committer | James Bottomley <JBottomley@Parallels.com> | 2012-05-17 06:16:23 -0400 |
commit | 93d1379e6924daef1968779d97c46ba2e0915fd2 (patch) | |
tree | b6638aef204c6c7cf1e524ddbf0d7347e20864c1 | |
parent | 809c75368d94d73c1fb4f1e6e3578ae3b5b72b1c (diff) |
[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>
-rw-r--r-- | drivers/scsi/lpfc/lpfc_bsg.c | 1 | ||||
-rw-r--r-- | drivers/scsi/lpfc/lpfc_sli.c | 8 |
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) | |||
599 | 599 | ||
600 | cmdiocbq->iocb_cmpl = lpfc_bsg_rport_els_cmp; | 600 | cmdiocbq->iocb_cmpl = lpfc_bsg_rport_els_cmp; |
601 | cmdiocbq->context1 = dd_data; | 601 | cmdiocbq->context1 = dd_data; |
602 | cmdiocbq->context_un.ndlp = ndlp; | ||
602 | cmdiocbq->context2 = rspiocbq; | 603 | cmdiocbq->context2 = rspiocbq; |
603 | dd_data->type = TYPE_IOCB; | 604 | dd_data->type = TYPE_IOCB; |
604 | dd_data->context_un.iocb.cmdiocbq = cmdiocbq; | 605 | 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) | |||
877 | } else if ((piocbq->iocb.ulpCommand == CMD_GEN_REQUEST64_CR) && | 877 | } else if ((piocbq->iocb.ulpCommand == CMD_GEN_REQUEST64_CR) && |
878 | !(piocbq->iocb_flag & LPFC_IO_LIBDFC)) | 878 | !(piocbq->iocb_flag & LPFC_IO_LIBDFC)) |
879 | ndlp = piocbq->context_un.ndlp; | 879 | ndlp = piocbq->context_un.ndlp; |
880 | else if ((piocbq->iocb.ulpCommand == CMD_ELS_REQUEST64_CR) && | ||
881 | (piocbq->iocb_flag & LPFC_IO_LIBDFC)) | ||
882 | ndlp = piocbq->context_un.ndlp; | ||
880 | else | 883 | else |
881 | ndlp = piocbq->context1; | 884 | ndlp = piocbq->context1; |
882 | 885 | ||
@@ -7868,7 +7871,10 @@ lpfc_sli4_iocb2wqe(struct lpfc_hba *phba, struct lpfc_iocbq *iocbq, | |||
7868 | 7871 | ||
7869 | switch (iocbq->iocb.ulpCommand) { | 7872 | switch (iocbq->iocb.ulpCommand) { |
7870 | case CMD_ELS_REQUEST64_CR: | 7873 | case CMD_ELS_REQUEST64_CR: |
7871 | ndlp = (struct lpfc_nodelist *)iocbq->context1; | 7874 | if (iocbq->iocb_flag & LPFC_IO_LIBDFC) |
7875 | ndlp = iocbq->context_un.ndlp; | ||
7876 | else | ||
7877 | ndlp = (struct lpfc_nodelist *)iocbq->context1; | ||
7872 | if (!iocbq->iocb.ulpLe) { | 7878 | if (!iocbq->iocb.ulpLe) { |
7873 | lpfc_printf_log(phba, KERN_ERR, LOG_SLI, | 7879 | lpfc_printf_log(phba, KERN_ERR, LOG_SLI, |
7874 | "2007 Only Limited Edition cmd Format" | 7880 | "2007 Only Limited Edition cmd Format" |