[SCSI] lpfc 8.3.33: Formally separate lpfc_sli_ring SLI-3 and SLI-4 variantions

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

1 files changed, 14 insertions, 11 deletions

diff --git a/drivers/scsi/lpfc/lpfc_mbox.c b/drivers/scsi/lpfc/lpfc_mbox.c
index 20336f09fb3c..0e5d9a4f3b3d 100644
--- a/drivers/scsi/lpfc/lpfc_mbox.c
+++ b/drivers/scsi/lpfc/lpfc_mbox.c
@@ -950,44 +950,47 @@ lpfc_config_pcb_setup(struct lpfc_hba * phba)
         for (i = 0; i < psli->num_rings; i++) {
                 pring = &psli->ring[i];
 
-                pring->sizeCiocb = phba->sli_rev == 3 ? SLI3_IOCB_CMD_SIZE:
+                pring->sli.sli3.sizeCiocb =
+                        phba->sli_rev == 3 ? SLI3_IOCB_CMD_SIZE :
                                                         SLI2_IOCB_CMD_SIZE;
-                pring->sizeRiocb = phba->sli_rev == 3 ? SLI3_IOCB_RSP_SIZE:
+                pring->sli.sli3.sizeRiocb =
+                        phba->sli_rev == 3 ? SLI3_IOCB_RSP_SIZE :
                                                         SLI2_IOCB_RSP_SIZE;
                 /* A ring MUST have both cmd and rsp entries defined to be
                    valid */
-                if ((pring->numCiocb == 0) || (pring->numRiocb == 0)) {
+                if ((pring->sli.sli3.numCiocb == 0) ||
+                        (pring->sli.sli3.numRiocb == 0)) {
                         pcbp->rdsc[i].cmdEntries = 0;
                         pcbp->rdsc[i].rspEntries = 0;
                         pcbp->rdsc[i].cmdAddrHigh = 0;
                         pcbp->rdsc[i].rspAddrHigh = 0;
                         pcbp->rdsc[i].cmdAddrLow = 0;
                         pcbp->rdsc[i].rspAddrLow = 0;
-                        pring->cmdringaddr = NULL;
-                        pring->rspringaddr = NULL;
+                        pring->sli.sli3.cmdringaddr = NULL;
+                        pring->sli.sli3.rspringaddr = NULL;
                         continue;
                 }
                 /* Command ring setup for ring */
-                pring->cmdringaddr = (void *)&phba->IOCBs[iocbCnt];
-                pcbp->rdsc[i].cmdEntries = pring->numCiocb;
+                pring->sli.sli3.cmdringaddr = (void *)&phba->IOCBs[iocbCnt];
+                pcbp->rdsc[i].cmdEntries = pring->sli.sli3.numCiocb;
 
                 offset = (uint8_t *) &phba->IOCBs[iocbCnt] -
                          (uint8_t *) phba->slim2p.virt;
                 pdma_addr = phba->slim2p.phys + offset;
                 pcbp->rdsc[i].cmdAddrHigh = putPaddrHigh(pdma_addr);
                 pcbp->rdsc[i].cmdAddrLow = putPaddrLow(pdma_addr);
-                iocbCnt += pring->numCiocb;
+                iocbCnt += pring->sli.sli3.numCiocb;
 
                 /* Response ring setup for ring */
-                pring->rspringaddr = (void *) &phba->IOCBs[iocbCnt];
+                pring->sli.sli3.rspringaddr = (void *) &phba->IOCBs[iocbCnt];
 
-                pcbp->rdsc[i].rspEntries = pring->numRiocb;
+                pcbp->rdsc[i].rspEntries = pring->sli.sli3.numRiocb;
                 offset = (uint8_t *)&phba->IOCBs[iocbCnt] -
                          (uint8_t *)phba->slim2p.virt;
                 pdma_addr = phba->slim2p.phys + offset;
                 pcbp->rdsc[i].rspAddrHigh = putPaddrHigh(pdma_addr);
                 pcbp->rdsc[i].rspAddrLow = putPaddrLow(pdma_addr);
-                iocbCnt += pring->numRiocb;
+                iocbCnt += pring->sli.sli3.numRiocb;
         }
 }