net/virtio: pack virtqueue structure

[dpdk.git] / drivers / net / virtio / virtio_rxtx_packed_avx.h

diff --git a/drivers/net/virtio/virtio_rxtx_packed_avx.h b/drivers/net/virtio/virtio_rxtx_packed_avx.h
index f831828..228cf54 100644 (file)
--- a/drivers/net/virtio/virtio_rxtx_packed_avx.h
+++ b/drivers/net/virtio/virtio_rxtx_packed_avx.h
@@ -12,7 +12,7 @@
 
 #include "virtio_logs.h"
 #include "virtio_ethdev.h"
-#include "virtio_pci.h"
+#include "virtio.h"
 #include "virtio_rxtx_packed.h"
 #include "virtqueue.h"
 
@@ -20,7 +20,7 @@ static inline int
 virtqueue_enqueue_batch_packed_vec(struct virtnet_tx *txvq,
                                   struct rte_mbuf **tx_pkts)
 {
-       struct virtqueue *vq = txvq->vq;
+       struct virtqueue *vq = virtnet_txq_to_vq(txvq);
        uint16_t head_size = vq->hw->vtnet_hdr_size;
        uint16_t idx = vq->vq_avail_idx;
        struct virtio_net_hdr *hdr;
@@ -71,13 +71,13 @@ virtqueue_enqueue_batch_packed_vec(struct virtnet_tx *txvq,
        }
 
        __m512i descs_base = _mm512_set_epi64(tx_pkts[3]->data_len,
-                       VIRTIO_MBUF_ADDR(tx_pkts[3], vq),
+                       tx_pkts[3]->buf_iova,
                        tx_pkts[2]->data_len,
-                       VIRTIO_MBUF_ADDR(tx_pkts[2], vq),
+                       tx_pkts[2]->buf_iova,
                        tx_pkts[1]->data_len,
-                       VIRTIO_MBUF_ADDR(tx_pkts[1], vq),
+                       tx_pkts[1]->buf_iova,
                        tx_pkts[0]->data_len,
-                       VIRTIO_MBUF_ADDR(tx_pkts[0], vq));
+                       tx_pkts[0]->buf_iova);
 
        /* id offset and data offset */
        __m512i data_offsets = _mm512_set_epi64((uint64_t)3 << ID_BITS_OFFSET,
@@ -142,7 +142,7 @@ static inline uint16_t
 virtqueue_dequeue_batch_packed_vec(struct virtnet_rx *rxvq,
                                   struct rte_mbuf **rx_pkts)
 {
-       struct virtqueue *vq = rxvq->vq;
+       struct virtqueue *vq = virtnet_rxq_to_vq(rxvq);
        struct virtio_hw *hw = vq->hw;
        uint16_t hdr_size = hw->vtnet_hdr_size;
        uint64_t addrs[PACKED_BATCH_SIZE];