diff options
| author |   Luca Boccassi <luca.boccassi@gmail.com> | 2017-08-16 18:42:05 +0100 |
|---|---|---|
| committer | Luca Boccassi <luca.boccassi@gmail.com> | 2017-08-16 18:46:04 +0100 |
| commit | f239aed5e674965691846e8ce3f187dd47523689 (patch) | |
| tree | a153a3125c6e183c73871a8ecaa4b285fed5fbd5 /lib/librte_lpm | |
| parent | bf7567fd2a5b0b28ab724046143c24561d38d015 (diff) | |
New upstream version 17.08
Change-Id: I288b50990f52646089d6b1f3aaa6ba2f091a51d7
Signed-off-by: Luca Boccassi <luca.boccassi@gmail.com>
Diffstat (limited to 'lib/librte_lpm')
| -rw-r--r-- | lib/librte_lpm/rte_lpm.c | 1 | ||||
| -rw-r--r-- | lib/librte_lpm/rte_lpm6.c | 1 | ||||
| -rw-r--r-- | lib/librte_lpm/rte_lpm_neon.h | 4 | ||||
| -rw-r--r-- | lib/librte_lpm/rte_lpm_sse.h | 3 |
4 files changed, 4 insertions, 5 deletions
diff --git a/lib/librte_lpm/rte_lpm.c b/lib/librte_lpm/rte_lpm.c index 978ac601..64c074e9 100644 --- a/lib/librte_lpm/rte_lpm.c +++ b/lib/librte_lpm/rte_lpm.c @@ -36,7 +36,6 @@ #include <errno.h> #include <stdarg.h> #include <stdio.h> -#include <errno.h> #include <sys/queue.h> #include <rte_log.h> diff --git a/lib/librte_lpm/rte_lpm6.c b/lib/librte_lpm/rte_lpm6.c index 9cc7be77..b4a7df34 100644 --- a/lib/librte_lpm/rte_lpm6.c +++ b/lib/librte_lpm/rte_lpm6.c @@ -35,7 +35,6 @@ #include <errno.h> #include <stdarg.h> #include <stdio.h> -#include <errno.h> #include <sys/queue.h> #include <rte_log.h> diff --git a/lib/librte_lpm/rte_lpm_neon.h b/lib/librte_lpm/rte_lpm_neon.h index 7efd9a0d..4fd33f33 100644 --- a/lib/librte_lpm/rte_lpm_neon.h +++ b/lib/librte_lpm/rte_lpm_neon.h @@ -1,7 +1,7 @@ /*- * BSD LICENSE * - * Copyright(c) 2015 Cavium Networks. All rights reserved. + * Copyright(c) 2015 Cavium, Inc. All rights reserved. * All rights reserved. * * Copyright(c) 2010-2014 Intel Corporation. All rights reserved. @@ -19,7 +19,7 @@ * notice, this list of conditions and the following disclaimer in * the documentation and/or other materials provided with the * distribution. - * * Neither the name of Cavium Networks nor the names of its + * * Neither the name of Cavium, Inc nor the names of its * contributors may be used to endorse or promote products derived * from this software without specific prior written permission. * diff --git a/lib/librte_lpm/rte_lpm_sse.h b/lib/librte_lpm/rte_lpm_sse.h index ef33c6a1..5f2c4d4a 100644 --- a/lib/librte_lpm/rte_lpm_sse.h +++ b/lib/librte_lpm/rte_lpm_sse.h @@ -78,7 +78,8 @@ rte_lpm_lookupx4(const struct rte_lpm *lpm, xmm_t ip, uint32_t hop[4], /* extract values from tbl24[] */ idx = _mm_cvtsi128_si64(i24); - i24 = _mm_srli_si128(i24, sizeof(uint64_t)); + /* With -O0 option, gcc 4.8 - 5.4 fails to fold sizeof() into a constant */ + i24 = _mm_srli_si128(i24, /* sizeof(uint64_t) */ 8); ptbl = (const uint32_t *)&lpm->tbl24[(uint32_t)idx]; tbl[0] = *ptbl; |