X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fpg%2Fcli.c;h=a09107c50c53c548686d63d348cd95362983d294;hb=671e60e65635b8d030bf303c88411192c747b59e;hp=745b9b2bf69840597d9f0e8140dd86ffaf85d73b;hpb=78c568905724af785e90185fd89fa8717b3b35c2;p=vpp.git

diff --git a/src/vnet/pg/cli.c b/src/vnet/pg/cli.c
index 745b9b2bf69..a09107c50c5 100644
--- a/src/vnet/pg/cli.c
+++ b/src/vnet/pg/cli.c
@@ -43,7 +43,7 @@
 #include <vnet/pg/pg.h>
 
 #ifdef CLIB_UNIX
-#include <vnet/unix/pcap.h>
+#include <vppinfra/pcap.h>
 #endif
 
 /* Root of all packet generator cli commands. */
@@ -92,7 +92,7 @@ pg_capture (pg_capture_args_t * a)
 
   pi = pool_elt_at_index (pg->interfaces, a->dev_instance);
   vec_free (pi->pcap_file_name);
-  memset (&pi->pcap_main, 0, sizeof (pi->pcap_main));
+  clib_memset (&pi->pcap_main, 0, sizeof (pi->pcap_main));
 
   if (a->is_enabled == 0)
     return 0;
@@ -224,7 +224,7 @@ pg_pcap_read (pg_stream_t * s, char *file_name)
 #else
   pcap_main_t pm;
   clib_error_t *error;
-  memset (&pm, 0, sizeof (pm));
+  clib_memset (&pm, 0, sizeof (pm));
   pm.file_name = file_name;
   error = pcap_read (&pm);
   s->replay_packet_templates = pm.packets_read;
@@ -305,7 +305,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_DEFAULT_FREE_LIST_BYTES;
+  s.buffer_bytes = VLIB_BUFFER_DATA_SIZE;
   s.if_id = 0;
   pcap_file_name = 0;
   while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)