commit a2f27af2144636db88b4937155ad9c86e82f2b50
author John Lo <loj@cisco.com> Thu Jul 28 18:41:45 2016 -0400
committer Dave Barach <openvpp@barachs.net> Fri Jul 29 00:25:55 2016 +0000
tree 49f50ac04e9f647b10c890cecfcd417939a12e31
parent 16ad6ae79fe9eb05684d1ed7b3790249d3595b62

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>

vnet/vnet/ip/ip4_forward.c

diff --git a/vnet/vnet/ip/ip4_forward.c b/vnet/vnet/ip/ip4_forward.c
index 767cc8f..8b71d2d 100644
--- a/vnet/vnet/ip/ip4_forward.c
+++ b/vnet/vnet/ip/ip4_forward.c
@@ -444,7 +444,6 @@
     {
       /* 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 @@
       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;
     }
 

vnet/vnet/ip/ip6_forward.c

diff --git a/vnet/vnet/ip/ip6_forward.c b/vnet/vnet/ip/ip6_forward.c
index 57057a7..1e4afa8 100644
--- a/vnet/vnet/ip/ip6_forward.c
+++ b/vnet/vnet/ip/ip6_forward.c
@@ -501,7 +501,6 @@
   {
     /* 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 @@
     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;
   }