config/arm: make N2 crypto an optional feature

[dpdk.git] / drivers / net / virtio / virtio_rxtx_simple_altivec.c

diff --git a/drivers/net/virtio/virtio_rxtx_simple_altivec.c b/drivers/net/virtio/virtio_rxtx_simple_altivec.c
index f856396..7534974 100644 (file)
--- a/drivers/net/virtio/virtio_rxtx_simple_altivec.c
+++ b/drivers/net/virtio/virtio_rxtx_simple_altivec.c
@@ -9,13 +9,12 @@
 #include <string.h>
 #include <errno.h>
 
-#include <altivec.h>
-
+#include <rte_altivec.h>
 #include <rte_byteorder.h>
 #include <rte_branch_prediction.h>
 #include <rte_cycles.h>
 #include <rte_ether.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_errno.h>
 #include <rte_memory.h>
 #include <rte_mempool.h>
@@ -42,9 +41,9 @@ virtio_recv_pkts_vec(void *rx_queue, struct rte_mbuf **rx_pkts,
        uint16_t nb_pkts)
 {
        struct virtnet_rx *rxvq = rx_queue;
-       struct virtqueue *vq = rxvq->vq;
+       struct virtqueue *vq = virtnet_rxq_to_vq(rxvq);
        struct virtio_hw *hw = vq->hw;
-       uint16_t nb_used;
+       uint16_t nb_used, nb_total;
        uint16_t desc_idx;
        struct vring_used_elem *rused;
        struct rte_mbuf **sw_ring;
@@ -86,7 +85,13 @@ virtio_recv_pkts_vec(void *rx_queue, struct rte_mbuf **rx_pkts,
        if (unlikely(nb_pkts < RTE_VIRTIO_DESC_PER_LOOP))
                return 0;
 
-       nb_used = VIRTQUEUE_NUSED(vq);
+       if (vq->vq_free_cnt >= RTE_VIRTIO_VPMD_RX_REARM_THRESH) {
+               virtio_rxq_rearm_vec(rxvq);
+               if (unlikely(virtqueue_kick_prepare(vq)))
+                       virtqueue_notify(vq);
+       }
+
+       nb_used = virtqueue_nused(vq);
 
        rte_compiler_barrier();
 
@@ -103,15 +108,10 @@ virtio_recv_pkts_vec(void *rx_queue, struct rte_mbuf **rx_pkts,
 
        rte_prefetch0(rused);
 
-       if (vq->vq_free_cnt >= RTE_VIRTIO_VPMD_RX_REARM_THRESH) {
-               virtio_rxq_rearm_vec(rxvq);
-               if (unlikely(virtqueue_kick_prepare(vq)))
-                       virtqueue_notify(vq);
-       }
-
+       nb_total = nb_used;
        ref_rx_pkts = rx_pkts;
        for (nb_pkts_received = 0;
-               nb_pkts_received < nb_used;) {
+               nb_pkts_received < nb_total;) {
                vector unsigned char desc[RTE_VIRTIO_DESC_PER_LOOP / 2];
                vector unsigned char mbp[RTE_VIRTIO_DESC_PER_LOOP / 2];
                vector unsigned char pkt_mb[RTE_VIRTIO_DESC_PER_LOOP];