net/iavf: add GTPU in default hash

[dpdk.git] / app / test / test_hash_functions.c

diff --git a/app/test/test_hash_functions.c b/app/test/test_hash_functions.c
index f767a48..76d51b6 100644 (file)
--- a/app/test/test_hash_functions.c
+++ b/app/test/test_hash_functions.c
@@ -1,34 +1,5 @@
-/*-
- *   BSD LICENSE
- *
- *   Copyright(c) 2010-2015 Intel Corporation. All rights reserved.
- *   All rights reserved.
- *
- *   Redistribution and use in source and binary forms, with or without
- *   modification, are permitted provided that the following conditions
- *   are met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in
- *       the documentation and/or other materials provided with the
- *       distribution.
- *     * Neither the name of Intel Corporation nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- *   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- *   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- *   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- *   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- *   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- *   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2010-2015 Intel Corporation
  */
 
 #include <stdio.h>
@@ -181,10 +152,10 @@ verify_precalculated_hash_func_tests(void)
        for (i = 0; i < 64; i++)
                key[i] = (uint8_t) i;
 
-       for (i = 0; i < sizeof(hashtest_key_lens) / sizeof(uint32_t); i++) {
-               for (j = 0; j < sizeof(hashtest_initvals) / sizeof(uint32_t); j++) {
+       for (i = 0; i < RTE_DIM(hashtest_key_lens); i++) {
+               for (j = 0; j < RTE_DIM(hashtest_initvals); j++) {
                        hash = rte_jhash(key, hashtest_key_lens[i],
-                                       hashtest_initvals[j]);
+                                        hashtest_initvals[j]);
                        if (hash != hash_values_jhash[j][i]) {
                                printf("jhash for %u bytes with initial value 0x%x."
                                       "Expected 0x%x, but got 0x%x\n",
@@ -221,8 +192,8 @@ verify_jhash_32bits(void)
        for (i = 0; i < 64; i++)
                key[i] = rand() & 0xff;
 
-       for (i = 0; i < sizeof(hashtest_key_lens) / sizeof(uint32_t); i++) {
-               for (j = 0; j < sizeof(hashtest_initvals) / sizeof(uint32_t); j++) {
+       for (i = 0; i < RTE_DIM(hashtest_key_lens); i++) {
+               for (j = 0; j < RTE_DIM(hashtest_initvals); j++) {
                        /* Key size must be multiple of 4 (32 bits) */
                        if ((hashtest_key_lens[i] & 0x3) == 0) {
                                hash = rte_jhash(key, hashtest_key_lens[i],
@@ -319,8 +290,4 @@ test_hash_functions(void)
        return 0;
 }
 
-static struct test_command hash_functions_cmd = {
-       .command = "hash_functions_autotest",
-       .callback = test_hash_functions,
-};
-REGISTER_TEST_COMMAND(hash_functions_cmd);
+REGISTER_TEST_COMMAND(hash_functions_autotest, test_hash_functions);