diff options
| author |   Neale Ranns <nranns@cisco.com> | 2018-11-07 09:25:54 -0800 |
|---|---|---|
| committer |   Damjan Marion <dmarion@me.com> | 2018-11-15 17:22:55 +0000 |
| commit | 13a08cc0984496d50722ffb75e2f48c5d84fb9a7 (patch) | |
| tree | ee1088dbe24d45ee725134ca5589acaf70ffc6d0 /src/vnet/adj | |
| parent | 96e2d4407b1538d8df4e277ba33b85876589e198 (diff) | |
GBP: redirect contracts
Change-Id: I463b153de93cfec29a9c15e8e84e41f6003d4c5f
Signed-off-by: Neale Ranns <nranns@cisco.com>
Diffstat (limited to 'src/vnet/adj')
| -rw-r--r-- | src/vnet/adj/adj_nbr.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/src/vnet/adj/adj_nbr.c b/src/vnet/adj/adj_nbr.c index 2fced18e9a2..38885095a4f 100644 --- a/src/vnet/adj/adj_nbr.c +++ b/src/vnet/adj/adj_nbr.c @@ -265,26 +265,24 @@ adj_nbr_add_or_lock_w_rewrite (fib_protocol_t nh_proto, u8 *rewrite) { adj_index_t adj_index; - ip_adjacency_t *adj; adj_index = adj_nbr_find(nh_proto, link_type, nh_addr, sw_if_index); if (ADJ_INDEX_INVALID == adj_index) { - adj = adj_nbr_alloc(nh_proto, link_type, nh_addr, sw_if_index); + ip_adjacency_t *adj; + + adj = adj_nbr_alloc(nh_proto, link_type, nh_addr, sw_if_index); adj->rewrite_header.sw_if_index = sw_if_index; - } - else - { - adj = adj_get(adj_index); + adj_index = adj_get_index(adj); } - adj_lock(adj_get_index(adj)); - adj_nbr_update_rewrite(adj_get_index(adj), + adj_lock(adj_index); + adj_nbr_update_rewrite(adj_index, ADJ_NBR_REWRITE_FLAG_COMPLETE, rewrite); - return (adj_get_index(adj)); + return (adj_index); } /** |