net: add rte prefix to IP defines

[dpdk.git] / app / test / test_table_acl.c

diff --git a/app/test/test_table_acl.c b/app/test/test_table_acl.c
index 22136a3..e01e1f9 100644 (file)
--- a/app/test/test_table_acl.c
+++ b/app/test/test_table_acl.c
@@ -7,7 +7,7 @@
 #include "test_table.h"
 #include "test_table_acl.h"
 
-#define IPv4(a, b, c, d) ((uint32_t)(((a) & 0xff) << 24) |             \
+#define RTE_IPv4(a, b, c, d) ((uint32_t)(((a) & 0xff) << 24) |         \
        (((b) & 0xff) << 16) |                                          \
        (((c) & 0xff) << 8) |                                           \
        ((d) & 0xff))
@@ -116,7 +116,7 @@ parse_ipv4_net(const char *in, uint32_t *addr, uint32_t *mask_len)
        GET_CB_FIELD(in, d, 0, UINT8_MAX, '/');
        GET_CB_FIELD(in, m, 0, sizeof(uint32_t) * CHAR_BIT, 0);
 
-       addr[0] = IPv4(a, b, c, d);
+       addr[0] = RTE_IPv4(a, b, c, d);
        mask_len[0] = m;
 
        return 0;
@@ -662,8 +662,8 @@ test_pipeline_single_filter(int expected_count)
                                sizeof(struct ipv4_5tuple));
 
                        five_tuple.proto = j;
-                       five_tuple.ip_src = rte_bswap32(IPv4(192, 168, j, 1));
-                       five_tuple.ip_dst = rte_bswap32(IPv4(10, 4, j, 1));
+                       five_tuple.ip_src = rte_bswap32(RTE_IPv4(192, 168, j, 1));
+                       five_tuple.ip_dst = rte_bswap32(RTE_IPv4(10, 4, j, 1));
                        five_tuple.port_src = rte_bswap16(100 + j);
                        five_tuple.port_dst = rte_bswap16(200 + j);