X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fplugins%2Flb%2Flb.c;h=0bd2ff5d2382e7ebd972c279c316405b46cc81cb;hb=d3c008d108aa2187d1a2afe2833b4de25ca2c2ab;hp=add81236ae599e1b0a4ab722f5392036ce14c49c;hpb=1bfb0ddace3ebb9010275e4bdd847c8c493ff4b3;p=vpp.git

diff --git a/src/plugins/lb/lb.c b/src/plugins/lb/lb.c
index add81236ae5..0bd2ff5d238 100644
--- a/src/plugins/lb/lb.c
+++ b/src/plugins/lb/lb.c
@@ -63,11 +63,11 @@ u8 *format_lb_main (u8 * s, va_list * args)
   s = format(s, " #vips: %u\n", pool_elts(lbm->vips));
   s = format(s, " #ass: %u\n", pool_elts(lbm->ass) - 1);
 
-  u32 cpu_index;
-  for(cpu_index = 0; cpu_index < tm->n_vlib_mains; cpu_index++ ) {
-    lb_hash_t *h = lbm->per_cpu[cpu_index].sticky_ht;
+  u32 thread_index;
+  for(thread_index = 0; thread_index < tm->n_vlib_mains; thread_index++ ) {
+    lb_hash_t *h = lbm->per_cpu[thread_index].sticky_ht;
     if (h) {
-      s = format(s, "core %d\n", cpu_index);
+      s = format(s, "core %d\n", thread_index);
       s = format(s, "  timeout: %ds\n", h->timeout);
       s = format(s, "  usage: %d / %d\n", lb_hash_elts(h, lb_hash_time_now(vlib_get_main())),  lb_hash_size(h));
     }
@@ -128,7 +128,7 @@ u8 *format_lb_vip_detailed (u8 * s, va_list * args)
 {
   lb_main_t *lbm = &lb_main;
   lb_vip_t *vip = va_arg (*args, lb_vip_t *);
-  uword indent = format_get_indent (s);
+  u32 indent = format_get_indent (s);
 
   s = format(s, "%U %U [%u] %U%s\n"
                    "%U  new_size:%u\n",
@@ -510,8 +510,7 @@ next:
 	fib_table_entry_special_add(0,
 				    &nh,
 				    FIB_SOURCE_RR,
-				    FIB_ENTRY_FLAG_NONE,
-				    ADJ_INDEX_INVALID);
+				    FIB_ENTRY_FLAG_NONE);
     as->next_hop_child_index =
 	fib_entry_child_add(as->next_hop_fib_entry_index,
 			    lbm->fib_node_type,