1 files changed, 14 insertions, 5 deletions

diff --git a/drivers/scsi/lpfc/lpfc_ct.c b/drivers/scsi/lpfc/lpfc_ct.c
index e724048bf390..0ebcd9baca79 100644
--- a/drivers/scsi/lpfc/lpfc_ct.c
+++ b/drivers/scsi/lpfc/lpfc_ct.c
@@ -31,6 +31,7 @@
 #include <scsi/scsi_device.h>
 #include <scsi/scsi_host.h>
 #include <scsi/scsi_transport_fc.h>
+#include <scsi/fc/fc_fs.h>
 
 #include "lpfc_hw4.h"
 #include "lpfc_hw.h"
@@ -336,8 +337,8 @@ lpfc_gen_req(struct lpfc_vport *vport, struct lpfc_dmabuf *bmp,
         /* Fill in rest of iocb */
         icmd->un.genreq64.w5.hcsw.Fctl = (SI | LA);
         icmd->un.genreq64.w5.hcsw.Dfctl = 0;
-        icmd->un.genreq64.w5.hcsw.Rctl = FC_UNSOL_CTL;
-        icmd->un.genreq64.w5.hcsw.Type = FC_COMMON_TRANSPORT_ULP;
+        icmd->un.genreq64.w5.hcsw.Rctl = FC_RCTL_DD_UNSOL_CTL;
+        icmd->un.genreq64.w5.hcsw.Type = FC_TYPE_CT;
 
         if (!tmo) {
                  /* FC spec states we need 3 * ratov for CT requests */
@@ -395,9 +396,14 @@ lpfc_ct_cmd(struct lpfc_vport *vport, struct lpfc_dmabuf *inmp,
         outmp = lpfc_alloc_ct_rsp(phba, cmdcode, bpl, rsp_size, &cnt);
         if (!outmp)
                 return -ENOMEM;
-
+        /*
+         * Form the CT IOCB.  The total number of BDEs in this IOCB
+         * is the single command plus response count from
+         * lpfc_alloc_ct_rsp.
+         */
+        cnt += 1;
         status = lpfc_gen_req(vport, bmp, inmp, outmp, cmpl, ndlp, 0,
-                              cnt+1, 0, retry);
+                              cnt, 0, retry);
         if (status) {
                 lpfc_free_ct_rsp(phba, outmp);
                 return -ENOMEM;
@@ -533,6 +539,9 @@ lpfc_ns_rsp(struct lpfc_vport *vport, struct lpfc_dmabuf *mp, uint32_t Size)
                                                         SLI_CTNS_GFF_ID,
                                                         0, Did) == 0)
                                                         vport->num_disc_nodes++;
+                                                else
+                                                        lpfc_setup_disc_node
+                                                                (vport, Did);
                                         }
                                         else {
                                                 lpfc_debugfs_disc_trc(vport,
@@ -1241,7 +1250,7 @@ lpfc_ns_cmd(struct lpfc_vport *vport, int cmdcode,
                     be16_to_cpu(SLI_CTNS_RFF_ID);
                 CtReq->un.rff.PortId = cpu_to_be32(vport->fc_myDID);
                 CtReq->un.rff.fbits = FC4_FEATURE_INIT;
-                CtReq->un.rff.type_code = FC_FCP_DATA;
+                CtReq->un.rff.type_code = FC_TYPE_FCP;
                 cmpl = lpfc_cmpl_ct_cmd_rff_id;
                 break;
         }