X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fpg%2Finput.c;h=b70f3ce4fc070b2402808b5cddc5ac88585440ec;hb=27cadd23b6c220e73552fa7b3fe61e5874d07cec;hp=597ae06004526bcd0de475bbec4d684c40e3a31d;hpb=586afd762bfa149f5ca167bd5fd5a0cd59ce94fe;p=vpp.git

diff --git a/src/vnet/pg/input.c b/src/vnet/pg/input.c
index 597ae060045..b70f3ce4fc0 100644
--- a/src/vnet/pg/input.c
+++ b/src/vnet/pg/input.c
@@ -1214,7 +1214,7 @@ pg_stream_fill_helper (pg_main_t * pg,
    * Historically, the pg maintained its own free lists and
    * device drivers tx paths would return pkts.
    */
-  if (vm->buffer_main->extern_buffer_mgmt == 0 &&
+  if (vm->buffer_main->callbacks_registered == 0 &&
       !(s->flags & PG_STREAM_FLAGS_DISABLE_BUFFER_RECYCLE))
     f->buffer_init_function = pg_buffer_init;
   f->buffer_init_function_opaque =
@@ -1238,7 +1238,7 @@ pg_stream_fill_helper (pg_main_t * pg,
   n_alloc = n_allocated;
 
   /* Reinitialize buffers */
-  if (vm->buffer_main->extern_buffer_mgmt == 0 || CLIB_DEBUG > 0
+  if (vm->buffer_main->callbacks_registered == 0 || CLIB_DEBUG > 0
       || (s->flags & PG_STREAM_FLAGS_DISABLE_BUFFER_RECYCLE))
     init_buffers_inline
       (vm, s,
@@ -1246,7 +1246,7 @@ pg_stream_fill_helper (pg_main_t * pg,
        n_alloc, (bi - s->buffer_indices) * s->buffer_bytes /* data offset */ ,
        s->buffer_bytes,
        /* set_data */
-       vm->buffer_main->extern_buffer_mgmt != 0
+       vm->buffer_main->callbacks_registered != 0
        || (s->flags & PG_STREAM_FLAGS_DISABLE_BUFFER_RECYCLE) != 0);
 
   if (next_buffers)
@@ -1388,7 +1388,7 @@ format_pg_input_trace (u8 * s, va_list * va)
   pg_main_t *pg = &pg_main;
   pg_stream_t *stream;
   vlib_node_t *n;
-  uword indent = format_get_indent (s);
+  u32 indent = format_get_indent (s);
 
   stream = 0;
   if (!pool_is_free_index (pg->streams, t->stream_index))