vhost_user: 'nregions' saves the actual number of mapped guest physical address area

[vpp.git] / src / vnet / pg / stream.c

diff --git a/src/vnet/pg/stream.c b/src/vnet/pg/stream.c
index 560c4b0..762f241 100644 (file)
--- a/src/vnet/pg/stream.c
+++ b/src/vnet/pg/stream.c
@@ -100,11 +100,11 @@ format_pg_output_trace (u8 * s, va_list * va)
   CLIB_UNUSED (vlib_main_t * vm) = va_arg (*va, vlib_main_t *);
   CLIB_UNUSED (vlib_node_t * node) = va_arg (*va, vlib_node_t *);
   pg_output_trace_t *t = va_arg (*va, pg_output_trace_t *);
-  uword indent = format_get_indent (s);
+  u32 indent = format_get_indent (s);
 
   s = format (s, "%Ubuffer 0x%x: %U",
              format_white_space, indent,
-             t->buffer_index, format_vlib_buffer, &t->buffer);
+             t->buffer_index, format_vnet_buffer, &t->buffer);
 
   s = format (s, "\n%U%U", format_white_space, indent,
              format_ethernet_header_with_length, t->buffer.pre_data,
@@ -223,10 +223,6 @@ pg_interface_add_or_get (pg_main_t * pg, uword if_id)
                                              CLIB_CACHE_LINE_BYTES);
          *pi->lockp = 0;
        }
-
-      ip4_sw_interface_enable_disable (pi->hw_if_index, 1);
-      ip6_sw_interface_enable_disable (pi->hw_if_index, 1);
-      mpls_sw_interface_enable_disable (&mpls_main, pi->hw_if_index, 1);
     }
 
   return i;
@@ -442,7 +438,7 @@ pg_stream_add (pg_main_t * pg, pg_stream_t * s_init)
     pg_buffer_index_t *bi;
     int n;
 
-    if (vm->buffer_main->extern_buffer_mgmt)
+    if (vm->buffer_main->callbacks_registered)
       s->buffer_bytes = VLIB_BUFFER_DATA_SIZE;
 
     if (!s->buffer_bytes)