These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / net / ethernet / brocade / bna / bfa_msgq.c

diff --git a/kernel/drivers/net/ethernet/brocade/bna/bfa_msgq.c b/kernel/drivers/net/ethernet/brocade/bna/bfa_msgq.c
index c07d5b9..9c5bb24 100644 (file)
--- a/kernel/drivers/net/ethernet/brocade/bna/bfa_msgq.c
+++ b/kernel/drivers/net/ethernet/brocade/bna/bfa_msgq.c
@@ -66,8 +66,9 @@ cmdq_sm_stopped_entry(struct bfa_msgq_cmdq *cmdq)
        cmdq->offset = 0;
        cmdq->bytes_to_copy = 0;
        while (!list_empty(&cmdq->pending_q)) {
-               bfa_q_deq(&cmdq->pending_q, &cmdq_ent);
-               bfa_q_qe_init(&cmdq_ent->qe);
+               cmdq_ent = list_first_entry(&cmdq->pending_q,
+                                           struct bfa_msgq_cmd_entry, qe);
+               list_del(&cmdq_ent->qe);
                call_cmdq_ent_cbfn(cmdq_ent, BFA_STATUS_FAILED);
        }
 }
@@ -242,8 +243,8 @@ bfa_msgq_cmdq_ci_update(struct bfa_msgq_cmdq *cmdq, struct bfi_mbmsg *mb)
 
        /* Walk through pending list to see if the command can be posted */
        while (!list_empty(&cmdq->pending_q)) {
-               cmd =
-               (struct bfa_msgq_cmd_entry *)bfa_q_first(&cmdq->pending_q);
+               cmd = list_first_entry(&cmdq->pending_q,
+                                      struct bfa_msgq_cmd_entry, qe);
                if (ntohs(cmd->msg_hdr->num_entries) <=
                        BFA_MSGQ_FREE_CNT(cmdq)) {
                        list_del(&cmd->qe);
@@ -615,7 +616,6 @@ bfa_msgq_attach(struct bfa_msgq *msgq, struct bfa_ioc *ioc)
        bfa_msgq_rspq_attach(&msgq->rspq, msgq);
 
        bfa_nw_ioc_mbox_regisr(msgq->ioc, BFI_MC_MSGQ, bfa_msgq_isr, msgq);
-       bfa_q_qe_init(&msgq->ioc_notify);
        bfa_ioc_notify_init(&msgq->ioc_notify, bfa_msgq_notify, msgq);
        bfa_nw_ioc_notify_register(msgq->ioc, &msgq->ioc_notify);
 }