New upstream version 18.08

[deb_dpdk.git] / drivers / net / enic / base / vnic_wq.c

diff --git a/drivers/net/enic/base/vnic_wq.c b/drivers/net/enic/base/vnic_wq.c
index d61c4c6..c9bf357 100644 (file)
--- a/drivers/net/enic/base/vnic_wq.c
+++ b/drivers/net/enic/base/vnic_wq.c
@@ -32,8 +32,8 @@ static int vnic_wq_alloc_bufs(struct vnic_wq *wq)
 {
        unsigned int count = wq->ring.desc_count;
        /* Allocate the mbuf ring */
-       wq->bufs = (struct vnic_wq_buf *)rte_zmalloc_socket("wq->bufs",
-                   sizeof(struct vnic_wq_buf) * count,
+       wq->bufs = (struct rte_mbuf **)rte_zmalloc_socket("wq->bufs",
+                   sizeof(struct rte_mbuf *) * count,
                    RTE_CACHE_LINE_SIZE, wq->socket_id);
        wq->head_idx = 0;
        wq->tail_idx = 0;
@@ -113,6 +113,7 @@ void vnic_wq_init(struct vnic_wq *wq, unsigned int cq_index,
        vnic_wq_init_start(wq, cq_index, 0, 0,
                error_interrupt_enable,
                error_interrupt_offset);
+       wq->cq_pend = 0;
        wq->last_completed_index = 0;
 }
 
@@ -145,9 +146,9 @@ int vnic_wq_disable(struct vnic_wq *wq)
 }
 
 void vnic_wq_clean(struct vnic_wq *wq,
-                  void (*buf_clean)(struct vnic_wq_buf *buf))
+                  void (*buf_clean)(struct rte_mbuf **buf))
 {
-       struct vnic_wq_buf *buf;
+       struct rte_mbuf **buf;
        unsigned int  to_clean = wq->tail_idx;
 
        buf = &wq->bufs[to_clean];