X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;ds=sidebyside;f=lib%2Flibrte_table%2Frte_table_acl.c;h=4416311b9ac8ebc65895c87e83981cdd59ca0350;hb=66e1591687ac;hp=c6d389eea4ce751bca7cf4341c075fedef99d319;hpb=6f41fe75e2dd8dd38f7bea7b9501edd4f9b72fa5;p=dpdk.git diff --git a/lib/librte_table/rte_table_acl.c b/lib/librte_table/rte_table_acl.c index c6d389eea4..4416311b9a 100644 --- a/lib/librte_table/rte_table_acl.c +++ b/lib/librte_table/rte_table_acl.c @@ -36,6 +36,7 @@ #include #include +#include #include #include @@ -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,