1 files changed, 2 insertions, 0 deletions

diff --git a/drivers/scsi/lpfc/lpfc_ct.c b/drivers/scsi/lpfc/lpfc_ct.c
index d9edfd90d7ff..779b88e1469d 100644
--- a/drivers/scsi/lpfc/lpfc_ct.c
+++ b/drivers/scsi/lpfc/lpfc_ct.c
@@ -352,6 +352,8 @@ lpfc_gen_req(struct lpfc_vport *vport, struct lpfc_dmabuf *bmp,
         icmd->ulpLe = 1;
         icmd->ulpClass = CLASS3;
         icmd->ulpContext = ndlp->nlp_rpi;
+        if (phba->sli_rev == LPFC_SLI_REV4)
+                icmd->ulpContext = phba->sli4_hba.rpi_ids[ndlp->nlp_rpi];
 
         if (phba->sli3_options & LPFC_SLI3_NPIV_ENABLED) {
                 /* For GEN_REQUEST64_CR, use the RPI */