acl: remove redundant macro

[dpdk.git] / app / test-acl / main.c

diff --git a/app/test-acl/main.c b/app/test-acl/main.c
index 5e8db04..be3d773 100644 (file)
--- a/app/test-acl/main.c
+++ b/app/test-acl/main.c
@@ -35,8 +35,6 @@
 #include <getopt.h>
 #include <string.h>
 
-#ifndef RTE_LIBRTE_ACL_STANDALONE
-
 #include <rte_cycles.h>
 #include <rte_per_lcore.h>
 #include <rte_lcore.h>
@@ -44,24 +42,6 @@
 
 #define        PRINT_USAGE_START       "%s [EAL options]\n"
 
-#else
-
-#define IPv4(a, b, c, d) ((uint32_t)(((a) & 0xff) << 24) | \
-                               (((b) & 0xff) << 16) |     \
-                               (((c) & 0xff) << 8)  |     \
-                               ((d) & 0xff))
-
-#define        RTE_LCORE_FOREACH_SLAVE(x)      while (((x) = 0))
-
-#define        rte_eal_remote_launch(a, b, c)  DUMMY_MACRO
-#define        rte_eal_mp_wait_lcore()         DUMMY_MACRO
-
-#define        rte_eal_init(c, v)      (0)
-
-#define        PRINT_USAGE_START       "%s\n"
-
-#endif /*RTE_LIBRTE_ACL_STANDALONE */
-
 #define        RTE_LOGTYPE_TESTACL     RTE_LOGTYPE_USER1
 
 #define        APP_NAME        "TESTACL"
@@ -759,7 +739,8 @@ add_cb_rules(FILE *f, struct rte_acl_ctx *ctx)
                        return rc;
                }
 
-               v.data.category_mask = LEN2MASK(RTE_ACL_MAX_CATEGORIES);
+               v.data.category_mask = RTE_LEN2MASK(RTE_ACL_MAX_CATEGORIES,
+                       typeof(v.data.category_mask));
                v.data.priority = RTE_ACL_MAX_PRIORITY - n;
                v.data.userdata = n;