fib: Decouple source from priority and behaviour

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

diff --git a/src/vnet/ip/ip6_ll_table.c b/src/vnet/ip/ip6_ll_table.c
index dfcb270..3672b63 100644 (file)
--- a/src/vnet/ip/ip6_ll_table.c
+++ b/src/vnet/ip/ip6_ll_table.c
@@ -283,7 +283,7 @@ ip6_ll_show_fib (vlib_main_t * vm,
     s = format (s, "%U, fib_index:%d, locks:[",
                format_fib_table_name, fib_index,
                FIB_PROTOCOL_IP6, fib_index);
-    FOR_EACH_FIB_SOURCE (source)
+    vec_foreach_index (source, fib_table->ft_locks)
     {
       if (0 != fib_table->ft_locks[source])
        {
@@ -298,7 +298,7 @@ ip6_ll_show_fib (vlib_main_t * vm,
     /* Show summary? */
     if (!verbose)
       {
-       BVT (clib_bihash) * h =
+       clib_bihash_24_8_t *h =
          &im6->ip6_table[IP6_FIB_TABLE_NON_FWDING].ip6_hash;
        int len;
 
@@ -307,7 +307,7 @@ ip6_ll_show_fib (vlib_main_t * vm,
        clib_memset (ca, 0, sizeof (*ca));
        ca->fib_index = fib_index;
 
-       BV (clib_bihash_foreach_key_value_pair)
+       clib_bihash_foreach_key_value_pair_24_8
          (h, count_routes_in_fib_at_prefix_length, ca);
 
        for (len = 128; len >= 0; len--)