From 8d53e9f3c6001dcb2865f6e894da5b54e1418f88 Mon Sep 17 00:00:00 2001 From: Christian Ehrhardt Date: Thu, 4 Jul 2019 10:40:06 +0200 Subject: New upstream version 18.11.2 Change-Id: I23eb4f9179abf1f9c659891f8fddb27ee68ad26b Signed-off-by: Christian Ehrhardt --- lib/librte_table/rte_table_hash.h | 6 +++--- lib/librte_table/rte_table_hash_func.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'lib/librte_table') diff --git a/lib/librte_table/rte_table_hash.h b/lib/librte_table/rte_table_hash.h index 6f55bd57..61a0eed6 100644 --- a/lib/librte_table/rte_table_hash.h +++ b/lib/librte_table/rte_table_hash.h @@ -29,7 +29,7 @@ extern "C" { * be picked and dropped, the most likely candidate for drop, i.e. the * current LRU key, is always picked. The LRU logic requires maintaining * specific data structures per each bucket. Use-cases: flow cache, etc. - * b. Extendible bucket (ext): The bucket is extended with space for 4 more + * b. Extendable bucket (ext): The bucket is extended with space for 4 more * keys. This is done by allocating additional memory at table init time, * which is used to create a pool of free keys (the size of this pool is * configurable and always a multiple of 4). On key add operation, the @@ -41,7 +41,7 @@ extern "C" { * current bucket is in extended state and a match is not found in the * first group of 4 keys, the search continues beyond the first group of * 4 keys, potentially until all keys in this bucket are examined. The - * extendible bucket logic requires maintaining specific data structures + * extendable bucket logic requires maintaining specific data structures * per table and per each bucket. Use-cases: flow table, etc. * 2. Key size: * a. Configurable key size @@ -86,7 +86,7 @@ struct rte_table_hash_params { uint64_t seed; }; -/** Extendible bucket hash table operations */ +/** Extendable bucket hash table operations */ extern struct rte_table_ops rte_table_hash_ext_ops; extern struct rte_table_ops rte_table_hash_key8_ext_ops; extern struct rte_table_ops rte_table_hash_key16_ext_ops; diff --git a/lib/librte_table/rte_table_hash_func.h b/lib/librte_table/rte_table_hash_func.h index 02296eab..11ea5a90 100644 --- a/lib/librte_table/rte_table_hash_func.h +++ b/lib/librte_table/rte_table_hash_func.h @@ -40,7 +40,7 @@ rte_crc32_u64(uint64_t crc, uint64_t v) return _mm_crc32_u64(crc, v); } -#elif defined(RTE_ARCH_ARM64) +#elif defined(RTE_ARCH_ARM64) && defined(RTE_MACHINE_CPUFLAG_CRC32) #include "rte_table_hash_func_arm64.h" #else -- cgit 1.2.3-korg