[SCSI] lpfc 8.3.40: Fixed some logging message fields

Signed-off-by: James Smart <james.smart@emulex.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>

diff --git a/drivers/scsi/lpfc/lpfc_sli.c b/drivers/scsi/lpfc/lpfc_sli.c
index a36a8c7..59addac 100644 (file)
--- a/drivers/scsi/lpfc/lpfc_sli.c
+++ b/drivers/scsi/lpfc/lpfc_sli.c
@@ -8713,7 +8713,7 @@ lpfc_sli4_abts_err_handler(struct lpfc_hba *phba,
        lpfc_printf_log(phba, KERN_WARNING, LOG_SLI,
                        "3116 Port generated FCP XRI ABORT event on "
                        "vpi %d rpi %d xri x%x status 0x%x parameter x%x\n",
-                       ndlp->vport->vpi, ndlp->nlp_rpi,
+                       ndlp->vport->vpi, phba->sli4_hba.rpi_ids[ndlp->nlp_rpi],
                        bf_get(lpfc_wcqe_xa_xri, axri),
                        bf_get(lpfc_wcqe_xa_status, axri),
                        axri->parameter);
@@ -9769,7 +9769,7 @@ lpfc_sli_abort_fcp_cmpl(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,
                        struct lpfc_iocbq *rspiocb)
 {
        lpfc_printf_log(phba, KERN_INFO, LOG_SLI,
-                       "3096 ABORT_XRI_CN completing on xri x%x "
+                       "3096 ABORT_XRI_CN completing on rpi x%x "
                        "original iotag x%x, abort cmd iotag x%x "
                        "status 0x%x, reason 0x%x\n",
                        cmdiocb->iocb.un.acxri.abortContextTag,