summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Lo <loj@cisco.com>2016-07-28 18:41:45 -0400
committerDave Barach <openvpp@barachs.net>2016-07-29 00:25:55 +0000
commita2f27af2144636db88b4937155ad9c86e82f2b50 (patch)
tree49f50ac04e9f647b10c890cecfcd417939a12e31
parent16ad6ae79fe9eb05684d1ed7b3790249d3595b62 (diff)
VPP-142 Follow up fix for shared_count of indirect adjacencies
Clean up dead code path added in previous attempt. Change-Id: Ib95b07bfd7699496f6808da97200993e2104d796 Signed-off-by: John Lo <loj@cisco.com>
-rw-r--r--vnet/vnet/ip/ip4_forward.c8
-rw-r--r--vnet/vnet/ip/ip6_forward.c8
2 files changed, 0 insertions, 16 deletions
diff --git a/vnet/vnet/ip/ip4_forward.c b/vnet/vnet/ip/ip4_forward.c
index 767cc8f8..8b71d2db 100644
--- a/vnet/vnet/ip/ip4_forward.c
+++ b/vnet/vnet/ip/ip4_forward.c
@@ -444,7 +444,6 @@ ip4_add_del_route_next_hop (ip4_main_t * im,
{
/* create / delete additional mapping of existing adjacency */
ip4_add_del_route_args_t a;
- ip_adjacency_t * nh_adj = ip_get_adjacency (lm, nh_adj_index);
a.table_index_or_table_id = fib_index;
a.flags = ((is_del ? IP4_ROUTE_FLAG_DEL : IP4_ROUTE_FLAG_ADD)
@@ -459,13 +458,6 @@ ip4_add_del_route_next_hop (ip4_main_t * im,
a.n_add_adj = 0;
ip4_add_del_route (im, &a);
-
- /* adjust share count. This cannot be the only use of the adjacency
- unless next hop is an indiect adj where share count is already
- incremented */
- if (next_hop_sw_if_index != ~0)
- nh_adj->share_count += is_del ? -1 : 1;
-
goto done;
}
diff --git a/vnet/vnet/ip/ip6_forward.c b/vnet/vnet/ip/ip6_forward.c
index 57057a72..1e4afa8d 100644
--- a/vnet/vnet/ip/ip6_forward.c
+++ b/vnet/vnet/ip/ip6_forward.c
@@ -501,7 +501,6 @@ ip6_add_del_route_next_hop (ip6_main_t * im,
{
/* create / delete additional mapping of existing adjacency */
ip6_add_del_route_args_t a;
- ip_adjacency_t * nh_adj = ip_get_adjacency (lm, nh_adj_index);
a.table_index_or_table_id = fib_index;
a.flags = ((is_del ? IP6_ROUTE_FLAG_DEL : IP6_ROUTE_FLAG_ADD)
@@ -516,13 +515,6 @@ ip6_add_del_route_next_hop (ip6_main_t * im,
a.n_add_adj = 0;
ip6_add_del_route (im, &a);
-
- /* adjust share count. This cannot be the only use of the adjacency
- unless next hop is an indiect adj where share count is already
- incremented */
- if (next_hop_sw_if_index != ~0)
- nh_adj->share_count += is_del ? -1 : 1;
-
goto done;
}