Remove the unused 'create VRF if needed' API parameters

[vpp.git] / src / vnet / ip / ip4_mtrie.c

diff --git a/src/vnet/ip/ip4_mtrie.c b/src/vnet/ip/ip4_mtrie.c
index cc82384..5b78cbe 100644 (file)
--- a/src/vnet/ip/ip4_mtrie.c
+++ b/src/vnet/ip/ip4_mtrie.c
@@ -683,8 +683,8 @@ mtrie_ply_memory_usage (ip4_fib_mtrie_t * m, ip4_fib_mtrie_8_ply_t * p)
 }
 
 /* Returns number of bytes of memory used by mtrie. */
-static uword
-mtrie_memory_usage (ip4_fib_mtrie_t * m)
+uword
+ip4_fib_mtrie_memory_usage (ip4_fib_mtrie_t * m)
 {
   uword bytes, i;
 
@@ -740,7 +740,7 @@ format_ip4_fib_mtrie_ply (u8 * s, va_list * va)
   u32 base_address = va_arg (*va, u32);
   u32 ply_index = va_arg (*va, u32);
   ip4_fib_mtrie_8_ply_t *p;
-  uword indent;
+  u32 indent;
   int i;
 
   p = pool_elt_at_index (ip4_ply_pool, ply_index);
@@ -764,25 +764,32 @@ u8 *
 format_ip4_fib_mtrie (u8 * s, va_list * va)
 {
   ip4_fib_mtrie_t *m = va_arg (*va, ip4_fib_mtrie_t *);
+  int verbose = va_arg (*va, int);
   ip4_fib_mtrie_16_ply_t *p;
   u32 base_address = 0;
   int i;
 
   s = format (s, "%d plies, memory usage %U\n",
              pool_elts (ip4_ply_pool),
-             format_memory_size, mtrie_memory_usage (m));
+             format_memory_size, ip4_fib_mtrie_memory_usage (m));
   s = format (s, "root-ply");
   p = &m->root_ply;
 
-  for (i = 0; i < ARRAY_LEN (p->leaves); i++)
+  if (verbose)
     {
-      u16 slot;
+      s = format (s, "root-ply");
+      p = &m->root_ply;
 
-      slot = clib_host_to_net_u16 (i);
-
-      if (p->dst_address_bits_of_leaves[slot] > 0)
+      for (i = 0; i < ARRAY_LEN (p->leaves); i++)
        {
-         FORMAT_PLY (s, p, slot, base_address, 16, 2);
+         u16 slot;
+
+         slot = clib_host_to_net_u16 (i);
+
+         if (p->dst_address_bits_of_leaves[slot] > 0)
+           {
+             FORMAT_PLY (s, p, slot, base_address, 16, 2);
+           }
        }
     }