nvme-fc and nvmet-fc: revise LLDD api for LS reception and LS request

[linux-2.6-microblaze.git] / drivers / scsi / lpfc / lpfc_nvmet.c

diff --git a/drivers/scsi/lpfc/lpfc_nvmet.c b/drivers/scsi/lpfc/lpfc_nvmet.c
index 565419b..3b25bcb 100644 (file)
--- a/drivers/scsi/lpfc/lpfc_nvmet.c
+++ b/drivers/scsi/lpfc/lpfc_nvmet.c
@@ -302,7 +302,7 @@ lpfc_nvmet_xmt_ls_rsp_cmp(struct lpfc_hba *phba, struct lpfc_iocbq *cmdwqe,
                          struct lpfc_wcqe_complete *wcqe)
 {
        struct lpfc_nvmet_tgtport *tgtp;
-       struct nvmefc_tgt_ls_req *rsp;
+       struct nvmefc_ls_rsp *rsp;
        struct lpfc_nvmet_rcv_ctx *ctxp;
        uint32_t status, result;
 
@@ -335,7 +335,7 @@ lpfc_nvmet_xmt_ls_rsp_cmp(struct lpfc_hba *phba, struct lpfc_iocbq *cmdwqe,
        }
 
 out:
-       rsp = &ctxp->ctx.ls_req;
+       rsp = &ctxp->ctx.ls_rsp;
 
        lpfc_nvmeio_data(phba, "NVMET LS  CMPL: xri x%x stat x%x result x%x\n",
                         ctxp->oxid, status, result);
@@ -828,10 +828,10 @@ lpfc_nvmet_xmt_fcp_op_cmp(struct lpfc_hba *phba, struct lpfc_iocbq *cmdwqe,
 
 static int
 lpfc_nvmet_xmt_ls_rsp(struct nvmet_fc_target_port *tgtport,
-                     struct nvmefc_tgt_ls_req *rsp)
+                     struct nvmefc_ls_rsp *rsp)
 {
        struct lpfc_nvmet_rcv_ctx *ctxp =
-               container_of(rsp, struct lpfc_nvmet_rcv_ctx, ctx.ls_req);
+               container_of(rsp, struct lpfc_nvmet_rcv_ctx, ctx.ls_rsp);
        struct lpfc_hba *phba = ctxp->phba;
        struct hbq_dmabuf *nvmebuf =
                (struct hbq_dmabuf *)ctxp->rqb_buffer;
@@ -1999,7 +1999,7 @@ dropit:
         * lpfc_nvmet_xmt_ls_rsp_cmp should free the allocated ctxp.
         */
        atomic_inc(&tgtp->rcv_ls_req_in);
-       rc = nvmet_fc_rcv_ls_req(phba->targetport, &ctxp->ctx.ls_req,
+       rc = nvmet_fc_rcv_ls_req(phba->targetport, NULL, &ctxp->ctx.ls_rsp,
                                 payload, size);
 
        lpfc_printf_log(phba, KERN_INFO, LOG_NVME_DISC,