virtio: allow starting with link down

[dpdk.git] / lib / librte_table / rte_table_acl.c

diff --git a/lib/librte_table/rte_table_acl.c b/lib/librte_table/rte_table_acl.c
index f74f22a..4416311 100644 (file)
--- a/lib/librte_table/rte_table_acl.c
+++ b/lib/librte_table/rte_table_acl.c
@@ -36,6 +36,7 @@
 
 #include <rte_common.h>
 #include <rte_mbuf.h>
+#include <rte_memory.h>
 #include <rte_malloc.h>
 #include <rte_log.h>
 
@@ -75,7 +76,7 @@ rte_table_acl_create(
        uint32_t action_table_size, acl_rule_list_size, acl_rule_memory_size;
        uint32_t total_size;
 
-       RTE_BUILD_BUG_ON(((sizeof(struct rte_table_acl) % CACHE_LINE_SIZE)
+       RTE_BUILD_BUG_ON(((sizeof(struct rte_table_acl) % RTE_CACHE_LINE_SIZE)
                != 0));
 
        /* Check input parameters */
@@ -102,15 +103,15 @@ rte_table_acl_create(
        entry_size = RTE_ALIGN(entry_size, sizeof(uint64_t));
 
        /* Memory allocation */
-       action_table_size = CACHE_LINE_ROUNDUP(p->n_rules * entry_size);
+       action_table_size = RTE_CACHE_LINE_ROUNDUP(p->n_rules * entry_size);
        acl_rule_list_size =
-               CACHE_LINE_ROUNDUP(p->n_rules * sizeof(struct rte_acl_rule *));
-       acl_rule_memory_size = CACHE_LINE_ROUNDUP(p->n_rules *
+               RTE_CACHE_LINE_ROUNDUP(p->n_rules * sizeof(struct rte_acl_rule *));
+       acl_rule_memory_size = RTE_CACHE_LINE_ROUNDUP(p->n_rules *
                RTE_ACL_RULE_SZ(p->n_rule_fields));
        total_size = sizeof(struct rte_table_acl) + action_table_size +
                acl_rule_list_size + acl_rule_memory_size;
 
-       acl = rte_zmalloc_socket("TABLE", total_size, CACHE_LINE_SIZE,
+       acl = rte_zmalloc_socket("TABLE", total_size, RTE_CACHE_LINE_SIZE,
                socket_id);
        if (acl == NULL) {
                RTE_LOG(ERR, TABLE,
@@ -126,8 +127,8 @@ rte_table_acl_create(
                &acl->memory[action_table_size + acl_rule_list_size];
 
        /* Initialization of internal fields */
-       rte_snprintf(acl->name[0], RTE_ACL_NAMESIZE, "%s_a", p->name);
-       rte_snprintf(acl->name[1], RTE_ACL_NAMESIZE, "%s_b", p->name);
+       snprintf(acl->name[0], RTE_ACL_NAMESIZE, "%s_a", p->name);
+       snprintf(acl->name[1], RTE_ACL_NAMESIZE, "%s_b", p->name);
        acl->name_id = 1;
 
        acl->acl_params.name = acl->name[acl->name_id];