Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Distributed Virtual Router Support
[vpp.git]
/
src
/
vnet
/
fib
/
fib_table.c
diff --git
a/src/vnet/fib/fib_table.c
b/src/vnet/fib/fib_table.c
index
ba1e272
..
d5625d8
100644
(file)
--- a/
src/vnet/fib/fib_table.c
+++ b/
src/vnet/fib/fib_table.c
@@
-481,7
+481,8
@@
fib_table_route_path_fixup (const fib_prefix_t *prefix,
}
if (fib_prefix_is_host(prefix) &&
ip46_address_is_zero(&path->frp_addr) &&
}
if (fib_prefix_is_host(prefix) &&
ip46_address_is_zero(&path->frp_addr) &&
- path->frp_sw_if_index != ~0)
+ path->frp_sw_if_index != ~0 &&
+ path->frp_proto != DPO_PROTO_ETHERNET)
{
path->frp_addr = prefix->fp_addr;
path->frp_flags |= FIB_ROUTE_PATH_ATTACHED;
{
path->frp_addr = prefix->fp_addr;
path->frp_flags |= FIB_ROUTE_PATH_ATTACHED;
@@
-846,7
+847,8
@@
fib_table_entry_delete (u32 fib_index,
* removing an etry that does not exist.
* i'll allow it, but i won't like it.
*/
* removing an etry that does not exist.
* i'll allow it, but i won't like it.
*/
- clib_warning("%U not in FIB", format_fib_prefix, prefix);
+ if (0)
+ clib_warning("%U not in FIB", format_fib_prefix, prefix);
}
else
{
}
else
{
@@
-1227,10
+1229,10
@@
fib_table_get_num_entries (u32 fib_index,
}
u8*
}
u8*
-format_fib_table_name (u8* s, va_list ap)
+format_fib_table_name (u8* s, va_list
*
ap)
{
{
- fib_node_index_t fib_index = va_arg(ap, fib_node_index_t);
- fib_protocol_t proto = va_arg(ap, int); // int promotion
+ fib_node_index_t fib_index = va_arg(
*
ap, fib_node_index_t);
+ fib_protocol_t proto = va_arg(
*
ap, int); // int promotion
fib_table_t *fib_table;
fib_table = fib_table_get(fib_index, proto);
fib_table_t *fib_table;
fib_table = fib_table_get(fib_index, proto);