test/dma: check index when no DMA completed

[dpdk.git] / app / test-pipeline / pipeline_hash.c

diff --git a/app/test-pipeline/pipeline_hash.c b/app/test-pipeline/pipeline_hash.c
index c201472..2dd8928 100644 (file)
--- a/app/test-pipeline/pipeline_hash.c
+++ b/app/test-pipeline/pipeline_hash.c
@@ -380,9 +380,9 @@ app_main_loop_worker_pipeline_hash(void) {
 
 uint64_t test_hash(
        void *key,
-       __attribute__((unused)) void *key_mask,
-       __attribute__((unused)) uint32_t key_size,
-       __attribute__((unused)) uint64_t seed)
+       __rte_unused void *key_mask,
+       __rte_unused uint32_t key_size,
+       __rte_unused uint64_t seed)
 {
        uint32_t *k32 = key;
        uint32_t ip_dst = rte_be_to_cpu_32(k32[0]);
@@ -393,8 +393,8 @@ uint64_t test_hash(
 
 uint32_t test_hash_cuckoo(
        const void *key,
-       __attribute__((unused)) uint32_t key_size,
-       __attribute__((unused)) uint32_t seed)
+       __rte_unused uint32_t key_size,
+       __rte_unused uint32_t seed)
 {
        const uint32_t *k32 = key;
        uint32_t ip_dst = rte_be_to_cpu_32(k32[0]);
@@ -426,8 +426,8 @@ app_main_loop_rx_metadata(void) {
                for (j = 0; j < n_mbufs; j++) {
                        struct rte_mbuf *m;
                        uint8_t *m_data, *key;
-                       struct ipv4_hdr *ip_hdr;
-                       struct ipv6_hdr *ipv6_hdr;
+                       struct rte_ipv4_hdr *ip_hdr;
+                       struct rte_ipv6_hdr *ipv6_hdr;
                        uint32_t ip_dst;
                        uint8_t *ipv6_dst;
                        uint32_t *signature, *k32;
@@ -440,15 +440,15 @@ app_main_loop_rx_metadata(void) {
                                        APP_METADATA_OFFSET(32));
 
                        if (RTE_ETH_IS_IPV4_HDR(m->packet_type)) {
-                               ip_hdr = (struct ipv4_hdr *)
-                                       &m_data[sizeof(struct ether_hdr)];
+                               ip_hdr = (struct rte_ipv4_hdr *)
+                                       &m_data[sizeof(struct rte_ether_hdr)];
                                ip_dst = ip_hdr->dst_addr;
 
                                k32 = (uint32_t *) key;
                                k32[0] = ip_dst & 0xFFFFFF00;
                        } else if (RTE_ETH_IS_IPV6_HDR(m->packet_type)) {
-                               ipv6_hdr = (struct ipv6_hdr *)
-                                       &m_data[sizeof(struct ether_hdr)];
+                               ipv6_hdr = (struct rte_ipv6_hdr *)
+                                       &m_data[sizeof(struct rte_ether_hdr)];
                                ipv6_dst = ipv6_hdr->dst_addr;
 
                                memcpy(key, ipv6_dst, 16);