Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
L2 over MPLS
[vpp.git]
/
src
/
vnet
/
fib
/
fib_entry_src_rr.c
diff --git
a/src/vnet/fib/fib_entry_src_rr.c
b/src/vnet/fib/fib_entry_src_rr.c
index
d66ef7b
..
1153f3f
100644
(file)
--- a/
src/vnet/fib/fib_entry_src_rr.c
+++ b/
src/vnet/fib/fib_entry_src_rr.c
@@
-35,7
+35,7
@@
fib_entry_src_rr_resolve_via_connected (fib_entry_src_t *src,
const fib_entry_t *cover)
{
const fib_route_path_t path = {
const fib_entry_t *cover)
{
const fib_route_path_t path = {
- .frp_proto = fib_
entry->fe_prefix.fp_proto
,
+ .frp_proto = fib_
proto_to_dpo(fib_entry->fe_prefix.fp_proto)
,
.frp_addr = fib_entry->fe_prefix.fp_addr,
.frp_sw_if_index = fib_entry_get_resolving_interface(
fib_entry_get_index(cover)),
.frp_addr = fib_entry->fe_prefix.fp_addr,
.frp_sw_if_index = fib_entry_get_resolving_interface(
fib_entry_get_index(cover)),
@@
-90,18
+90,17
@@
fib_entry_src_rr_use_covers_pl (fib_entry_src_t *src,
const fib_entry_t *cover)
{
fib_node_index_t *entries = NULL;
const fib_entry_t *cover)
{
fib_node_index_t *entries = NULL;
-
fib_protocol
_t proto;
+
dpo_proto
_t proto;
- proto = fib_
entry->fe_prefix.fp_proto
;
+ proto = fib_
proto_to_dpo(fib_entry->fe_prefix.fp_proto)
;
vec_add1(entries, fib_entry_get_index(fib_entry));
if (fib_path_list_recursive_loop_detect(cover->fe_parent,
&entries))
{
vec_add1(entries, fib_entry_get_index(fib_entry));
if (fib_path_list_recursive_loop_detect(cover->fe_parent,
&entries))
{
- src->fes_pl = fib_path_list_create_special(
- proto,
- FIB_PATH_LIST_FLAG_DROP,
- drop_dpo_get(fib_proto_to_dpo(proto)));
+ src->fes_pl = fib_path_list_create_special(proto,
+ FIB_PATH_LIST_FLAG_DROP,
+ drop_dpo_get(proto));
}
else
{
}
else
{
@@
-126,7
+125,7
@@
fib_entry_src_rr_activate (fib_entry_src_t *src,
*/
if (FIB_PROTOCOL_MPLS == fib_entry->fe_prefix.fp_proto)
{
*/
if (FIB_PROTOCOL_MPLS == fib_entry->fe_prefix.fp_proto)
{
- src->fes_pl = fib_path_list_create_special(
FIB_PROTOCOL
_MPLS,
+ src->fes_pl = fib_path_list_create_special(
DPO_PROTO
_MPLS,
FIB_PATH_LIST_FLAG_DROP,
NULL);
fib_path_list_lock(src->fes_pl);
FIB_PATH_LIST_FLAG_DROP,
NULL);
fib_path_list_lock(src->fes_pl);