Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
MPLS Mcast
[vpp.git]
/
src
/
vnet
/
adj
/
adj_nbr.c
diff --git
a/src/vnet/adj/adj_nbr.c
b/src/vnet/adj/adj_nbr.c
index
072abd0
..
3d450d1
100644
(file)
--- a/
src/vnet/adj/adj_nbr.c
+++ b/
src/vnet/adj/adj_nbr.c
@@
-195,8
+195,6
@@
adj_nbr_alloc (fib_protocol_t nh_proto,
adj->ia_link = link_type;
adj->ia_nh_proto = nh_proto;
adj->rewrite_header.sw_if_index = sw_if_index;
adj->ia_link = link_type;
adj->ia_nh_proto = nh_proto;
adj->rewrite_header.sw_if_index = sw_if_index;
- memset(&adj->sub_type.midchain.next_dpo, 0,
- sizeof(adj->sub_type.midchain.next_dpo));
adj_nbr_evaluate_feature (adj_get_index(adj));
return (adj);
adj_nbr_evaluate_feature (adj_get_index(adj));
return (adj);
@@
-333,7
+331,7
@@
adj_nbr_update_rewrite (adj_index_t adj_index,
*/
void
adj_nbr_update_rewrite_internal (ip_adjacency_t *adj,
*/
void
adj_nbr_update_rewrite_internal (ip_adjacency_t *adj,
-
u32
adj_next_index,
+
ip_lookup_next_t
adj_next_index,
u32 this_node,
u32 next_node,
u8 *rewrite)
u32 this_node,
u32 next_node,
u8 *rewrite)
@@
-367,7
+365,7
@@
adj_nbr_update_rewrite_internal (ip_adjacency_t *adj,
if (ADJ_INDEX_INVALID != walk_ai)
{
walk_adj = adj_get(walk_ai);
if (ADJ_INDEX_INVALID != walk_ai)
{
walk_adj = adj_get(walk_ai);
- if (
IP_ADJ
_SYNC_WALK_ACTIVE & walk_adj->ia_flags)
+ if (
ADJ_FLAG
_SYNC_WALK_ACTIVE & walk_adj->ia_flags)
{
do_walk = 0;
}
{
do_walk = 0;
}
@@
-376,7
+374,7
@@
adj_nbr_update_rewrite_internal (ip_adjacency_t *adj,
/*
* Prevent re-entrant walk of the same adj
*/
/*
* Prevent re-entrant walk of the same adj
*/
- walk_adj->ia_flags |=
IP_ADJ
_SYNC_WALK_ACTIVE;
+ walk_adj->ia_flags |=
ADJ_FLAG
_SYNC_WALK_ACTIVE;
do_walk = 1;
}
}
do_walk = 1;
}
}
@@
-502,7
+500,7
@@
adj_nbr_update_rewrite_internal (ip_adjacency_t *adj,
*/
if (do_walk)
{
*/
if (do_walk)
{
- walk_adj->ia_flags &= ~
IP_ADJ
_SYNC_WALK_ACTIVE;
+ walk_adj->ia_flags &= ~
ADJ_FLAG
_SYNC_WALK_ACTIVE;
}
adj_unlock(adj_get_index(adj));
}
adj_unlock(adj_get_index(adj));