1 files changed, 10 insertions, 10 deletions

diff --git a/drivers/scsi/lpfc/lpfc_ct.c b/drivers/scsi/lpfc/lpfc_ct.c
index 7fc74cf5823b..26dae8bae2d1 100644
--- a/drivers/scsi/lpfc/lpfc_ct.c
+++ b/drivers/scsi/lpfc/lpfc_ct.c
@@ -34,6 +34,7 @@
 
 #include "lpfc_hw.h"
 #include "lpfc_sli.h"
+#include "lpfc_nl.h"
 #include "lpfc_disc.h"
 #include "lpfc_scsi.h"
 #include "lpfc.h"
@@ -134,25 +135,24 @@ lpfc_ct_unsol_event(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,
                 }
                 list_del(&head);
         } else {
-                struct lpfc_iocbq  *next;
-
-                list_for_each_entry_safe(iocbq, next, &piocbq->list, list) {
+                INIT_LIST_HEAD(&head);
+                list_add_tail(&head, &piocbq->list);
+                list_for_each_entry(iocbq, &head, list) {
                         icmd = &iocbq->iocb;
                         if (icmd->ulpBdeCount == 0)
-                                lpfc_ct_unsol_buffer(phba, piocbq, NULL, 0);
+                                lpfc_ct_unsol_buffer(phba, iocbq, NULL, 0);
                         for (i = 0; i < icmd->ulpBdeCount; i++) {
                                 paddr = getPaddr(icmd->un.cont64[i].addrHigh,
                                                  icmd->un.cont64[i].addrLow);
                                 mp = lpfc_sli_ringpostbuf_get(phba, pring,
                                                               paddr);
                                 size = icmd->un.cont64[i].tus.f.bdeSize;
-                                lpfc_ct_unsol_buffer(phba, piocbq, mp, size);
+                                lpfc_ct_unsol_buffer(phba, iocbq, mp, size);
                                 lpfc_in_buf_free(phba, mp);
                         }
-                        list_del(&iocbq->list);
-                        lpfc_sli_release_iocbq(phba, iocbq);
                         lpfc_post_buffer(phba, pring, i);
                 }
+                list_del(&head);
         }
 }
 
@@ -212,7 +212,7 @@ lpfc_alloc_ct_rsp(struct lpfc_hba *phba, int cmdcode, struct ulp_bde64 *bpl,
                 else
                         list_add_tail(&mp->list, &mlist->list);
 
-                bpl->tus.f.bdeFlags = BUFF_USE_RCV;
+                bpl->tus.f.bdeFlags = BUFF_TYPE_BDE_64I;
                 /* build buffer ptr list for IOCB */
                 bpl->addrLow = le32_to_cpu(putPaddrLow(mp->phys) );
                 bpl->addrHigh = le32_to_cpu(putPaddrHigh(mp->phys) );
@@ -283,7 +283,7 @@ lpfc_gen_req(struct lpfc_vport *vport, struct lpfc_dmabuf *bmp,
         icmd->un.genreq64.bdl.ulpIoTag32 = 0;
         icmd->un.genreq64.bdl.addrHigh = putPaddrHigh(bmp->phys);
         icmd->un.genreq64.bdl.addrLow = putPaddrLow(bmp->phys);
-        icmd->un.genreq64.bdl.bdeFlags = BUFF_TYPE_BDL;
+        icmd->un.genreq64.bdl.bdeFlags = BUFF_TYPE_BLP_64;
         icmd->un.genreq64.bdl.bdeSize = (num_entry * sizeof (struct ulp_bde64));
 
         if (usr_flg)
@@ -861,7 +861,7 @@ lpfc_cmpl_ct(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,
 
                 retry++;
                 lpfc_printf_vlog(vport, KERN_INFO, LOG_DISCOVERY,
-                                 "0216 Retrying NS cmd %x\n", cmdcode);
+                                 "0250 Retrying NS cmd %x\n", cmdcode);
                 rc = lpfc_ns_cmd(vport, cmdcode, retry, 0);
                 if (rc == 0)
                         goto out;