X-Git-Url: https://gerrit.fd.io/r/gitweb?p=vpp.git;a=blobdiff_plain;f=src%2Fvnet%2Fpg%2Fcli.c;h=4526986d1ff802ad1669342a062f1886c3effca3;hp=bca055153792c6e769c688ed7f6baeff01620829;hb=8feeaff56;hpb=4222347a87994cc109499ebe67498792c0e705f8

diff --git a/src/vnet/pg/cli.c b/src/vnet/pg/cli.c
index bca05515379..4526986d1ff 100644
--- a/src/vnet/pg/cli.c
+++ b/src/vnet/pg/cli.c
@@ -163,7 +163,7 @@ format_pg_edit_group (u8 * s, va_list * va)
       while (*junk_after_name && *junk_after_name != ' ')
 	junk_after_name++;
       *junk_after_name = 0;
-      s = format (s, "edit-funtion %s, ", function_name);
+      s = format (s, "edit-function %s, ", function_name);
       vec_free (function_name);
     }
 
@@ -267,8 +267,6 @@ pg_pcap_read (pg_stream_t * s, char *file_name)
   s->min_packet_bytes = pm.min_packet_bytes;
   s->max_packet_bytes = pm.max_packet_bytes;
   s->buffer_bytes = pm.max_packet_bytes;
-  /* For PCAP buffers we never re-use buffers. */
-  s->flags |= PG_STREAM_FLAGS_DISABLE_BUFFER_RECYCLE;
 
   if (s->n_packets_limit == 0)
     s->n_packets_limit = vec_len (pm.packets_read);
@@ -341,7 +339,7 @@ new_stream (vlib_main_t * vm,
   s.sw_if_index[VLIB_RX] = s.sw_if_index[VLIB_TX] = ~0;
   s.node_index = ~0;
   s.max_packet_bytes = s.min_packet_bytes = 64;
-  s.buffer_bytes = VLIB_BUFFER_DATA_SIZE;
+  s.buffer_bytes = vlib_buffer_get_default_data_size (vm);
   s.if_id = 0;
   pcap_file_name = 0;
   while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
@@ -387,9 +385,6 @@ new_stream (vlib_main_t * vm,
       else if (unformat_user (input, unformat_pg_stream_parameter, &s))
 	;
 
-      else if (unformat (input, "no-recycle"))
-	s.flags |= PG_STREAM_FLAGS_DISABLE_BUFFER_RECYCLE;
-
       else
 	{
 	  error = clib_error_create ("unknown input `%U'",