Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
API: Add support for type aliases
[vpp.git]
/
src
/
vnet
/
fib
/
ip6_fib.c
diff --git
a/src/vnet/fib/ip6_fib.c
b/src/vnet/fib/ip6_fib.c
index
fa9eb11
..
7375b56
100644
(file)
--- a/
src/vnet/fib/ip6_fib.c
+++ b/
src/vnet/fib/ip6_fib.c
@@
-60,11
+60,11
@@
create_fib_with_table_id (u32 table_id,
fib_table_t *fib_table;
ip6_fib_t *v6_fib;
fib_table_t *fib_table;
ip6_fib_t *v6_fib;
- pool_get
_aligned(ip6_main.fibs, fib_table, CLIB_CACHE_LINE_BYTES
);
+ pool_get
(ip6_main.fibs, fib_table
);
pool_get_aligned(ip6_main.v6_fibs, v6_fib, CLIB_CACHE_LINE_BYTES);
pool_get_aligned(ip6_main.v6_fibs, v6_fib, CLIB_CACHE_LINE_BYTES);
- memset(fib_table, 0, sizeof(*fib_table));
- memset(v6_fib, 0, sizeof(*v6_fib));
+
clib_
memset(fib_table, 0, sizeof(*fib_table));
+
clib_
memset(v6_fib, 0, sizeof(*v6_fib));
ASSERT((fib_table - ip6_main.fibs) ==
(v6_fib - ip6_main.v6_fibs));
ASSERT((fib_table - ip6_main.fibs) ==
(v6_fib - ip6_main.v6_fibs));
@@
-571,12
+571,13
@@
format_ip6_fib_table_memory (u8 * s, va_list * args)
uword bytes_inuse;
bytes_inuse =
uword bytes_inuse;
bytes_inuse =
- ip6_main.ip6_table[IP6_FIB_TABLE_NON_FWDING].ip6_hash.alloc_arena_next
- - ip6_main.ip6_table[IP6_FIB_TABLE_NON_FWDING].ip6_hash.alloc_arena;
+ alloc_arena_next
+ (&(ip6_main.ip6_table[IP6_FIB_TABLE_NON_FWDING].ip6_hash))
+ - alloc_arena (&(ip6_main.ip6_table[IP6_FIB_TABLE_NON_FWDING].ip6_hash));
bytes_inuse +=
bytes_inuse +=
- ip6_main.ip6_table[IP6_FIB_TABLE_FWDING].ip6_hash.alloc_arena_next
- -
ip6_main.ip6_table[IP6_FIB_TABLE_FWDING].ip6_hash.alloc_arena
;
+ alloc_arena_next(&(ip6_main.ip6_table[IP6_FIB_TABLE_FWDING].ip6_hash))
+ -
alloc_arena(&(ip6_main.ip6_table[IP6_FIB_TABLE_FWDING].ip6_hash))
;
s = format(s, "%=30s %=6d %=8ld\n",
"IPv6 unicast",
s = format(s, "%=30s %=6d %=8ld\n",
"IPv6 unicast",
@@
-689,7
+690,7
@@
ip6_show_fib (vlib_main_t * vm,
vlib_cli_output (vm, "%=20s%=16s", "Prefix length", "Count");
vlib_cli_output (vm, "%=20s%=16s", "Prefix length", "Count");
- memset (ca, 0, sizeof(*ca));
+
clib_
memset (ca, 0, sizeof(*ca));
ca->fib_index = fib->index;
BV(clib_bihash_foreach_key_value_pair)
ca->fib_index = fib->index;
BV(clib_bihash_foreach_key_value_pair)