X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fip%2Flookup.c;h=2321c0726203988ff1db8238dbcea7928318c7ec;hb=107e7d4b5375295e94e01653e3cf064ea6647064;hp=597de06b5e35f97e450fe01476055a36da0588af;hpb=0f26c5a0138ac86d7ebd197c31a09d8d624c35fe;p=vpp.git

diff --git a/src/vnet/ip/lookup.c b/src/vnet/ip/lookup.c
index 597de06b5e3..2321c072620 100755
--- a/src/vnet/ip/lookup.c
+++ b/src/vnet/ip/lookup.c
@@ -191,9 +191,6 @@ VNET_SW_INTERFACE_ADD_DEL_FUNCTION (ip_sw_interface_add_del);
 void
 ip_lookup_init (ip_lookup_main_t * lm, u32 is_ip6)
 {
-  /* Preallocate three "special" adjacencies */
-  lm->adjacency_heap = adj_pool;
-
   if (!lm->fib_result_n_bytes)
     lm->fib_result_n_bytes = sizeof (uword);
 
@@ -353,32 +350,6 @@ const ip46_address_t zero_addr = {
 	     0, 0},
 };
 
-u32
-fib_table_id_find_fib_index (fib_protocol_t proto, u32 table_id)
-{
-  ip4_main_t *im4 = &ip4_main;
-  ip6_main_t *im6 = &ip6_main;
-  uword *p;
-
-  switch (proto)
-    {
-    case FIB_PROTOCOL_IP4:
-      p = hash_get (im4->fib_index_by_table_id, table_id);
-      break;
-    case FIB_PROTOCOL_IP6:
-      p = hash_get (im6->fib_index_by_table_id, table_id);
-      break;
-    default:
-      p = NULL;
-      break;
-    }
-  if (NULL != p)
-    {
-      return (p[0]);
-    }
-  return (~0);
-}
-
 clib_error_t *
 vnet_ip_route_cmd (vlib_main_t * vm,
 		   unformat_input_t * main_input, vlib_cli_command_t * cmd)
@@ -602,7 +573,7 @@ vnet_ip_route_cmd (vlib_main_t * vm,
     }
   else
     {
-      fib_index = fib_table_id_find_fib_index (prefixs[0].fp_proto, table_id);
+      fib_index = fib_table_find (prefixs[0].fp_proto, table_id);
 
       if (~0 == fib_index)
 	{
@@ -651,8 +622,8 @@ vnet_ip_route_cmd (vlib_main_t * vm,
 		  /*
 		   * the CLI parsing stored table Ids, swap to FIB indicies
 		   */
-		  fi = fib_table_id_find_fib_index (prefixs[i].fp_proto,
-						    rpaths[i].frp_fib_index);
+		  fi = fib_table_find (prefixs[i].fp_proto,
+				       rpaths[i].frp_fib_index);
 
 		  if (~0 == fi)
 		    {