X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=app%2Ftest%2Ftest_table_acl.c;h=0bdf76ab70b36eea1e17fe67273945cbab9d598d;hb=de321d59181c680774e01e338f09e8e9c89c71be;hp=e01e1f946cc5d2bbf18042dc893e1f3382e2b97e;hpb=24ac604ef7469eb5773c2504b313dd00257f8df3;p=dpdk.git diff --git a/app/test/test_table_acl.c b/app/test/test_table_acl.c index e01e1f946c..0bdf76ab70 100644 --- a/app/test/test_table_acl.c +++ b/app/test/test_table_acl.c @@ -2,16 +2,12 @@ * Copyright(c) 2010-2014 Intel Corporation */ +#include #include #include #include "test_table.h" #include "test_table_acl.h" -#define RTE_IPv4(a, b, c, d) ((uint32_t)(((a) & 0xff) << 24) | \ - (((b) & 0xff) << 16) | \ - (((c) & 0xff) << 8) | \ - ((d) & 0xff)) - /* * Rule and trace formats definitions. **/ @@ -116,7 +112,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] = RTE_IPv4(a, b, c, d); + addr[0] = RTE_IPV4(a, b, c, d); mask_len[0] = m; return 0; @@ -662,8 +658,8 @@ test_pipeline_single_filter(int expected_count) sizeof(struct ipv4_5tuple)); five_tuple.proto = j; - 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.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);