X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fip%2Fping.c;h=3847d8379621be6f798f8feafe19aa4791a125c0;hb=f8d50682cd1245f6f5ce4c846ca6f1bdc11255a6;hp=92a92e50201d0b012070248e9cfa3a849846ed26;hpb=36eb7c214280a5442186a2d13ed018bbd26a1a3a;p=vpp.git

diff --git a/src/vnet/ip/ping.c b/src/vnet/ip/ping.c
index 92a92e50201..3847d837962 100755
--- a/src/vnet/ip/ping.c
+++ b/src/vnet/ip/ping.c
@@ -26,7 +26,7 @@ ping_main_t ping_main;
  * @file
  * @brief IPv4 and IPv6 ICMP Ping.
  *
- * This file contains code to suppport IPv4 or IPv6 ICMP ECHO_REQUEST to
+ * This file contains code to support IPv4 or IPv6 ICMP ECHO_REQUEST to
  * network hosts.
  *
  */
@@ -388,7 +388,7 @@ init_icmp46_echo_request (vlib_main_t * vm, vlib_buffer_t * b0,
   int l34_len =
     l4_header_offset + sizeof (icmp46_header_t) +
     offsetof (icmp46_echo_request_t, data);
-  int max_data_len = VLIB_BUFFER_DATA_SIZE - l34_len;
+  int max_data_len = vlib_buffer_get_default_data_size (vm) - l34_len;
 
   int first_buf_data_len = data_len < max_data_len ? data_len : max_data_len;
 
@@ -403,7 +403,8 @@ init_icmp46_echo_request (vlib_main_t * vm, vlib_buffer_t * b0,
     {
       int this_buf_data_len =
 	remaining_data_len <
-	VLIB_BUFFER_DATA_SIZE ? remaining_data_len : VLIB_BUFFER_DATA_SIZE;
+	vlib_buffer_get_default_data_size (vm) ? remaining_data_len :
+	vlib_buffer_get_default_data_size (vm);
       int n_alloc = vlib_buffer_alloc (vm, &b0->next_buffer, 1);
       if (n_alloc < 1)
 	{
@@ -745,15 +746,12 @@ send_ip46_ping (vlib_main_t * vm,
   u32 bi0 = 0;
   int n_buf0 = 0;
   vlib_buffer_t *b0;
-  vlib_buffer_free_list_t *fl;
 
   n_buf0 = vlib_buffer_alloc (vm, &bi0, 1);
   if (n_buf0 < 1)
     ERROR_OUT (SEND_PING_ALLOC_FAIL);
 
   b0 = vlib_get_buffer (vm, bi0);
-  fl = vlib_buffer_get_free_list (vm, VLIB_BUFFER_DEFAULT_FREE_LIST_INDEX);
-  vlib_buffer_init_for_free_list (b0, fl);
   VLIB_BUFFER_TRACE_TRAJECTORY_INIT (b0);
 
   /*
@@ -1230,8 +1228,8 @@ VLIB_CLI_COMMAND (ping_command, static) =
   .function = ping_ip_address,
   .short_help = "ping {<ip-addr> | ipv4 <ip4-addr> | ipv6 <ip6-addr>}"
   " [ipv4 <ip4-addr> | ipv6 <ip6-addr>] [source <interface>]"
-  " [size <pktsize>] [interval <sec>] [repeat <cnt>] [table-id <id>]"
-  " [verbose]",
+  " [size <pktsize:60>] [interval <sec:1>] [repeat <cnt:5>] [table-id <id:0>]"
+  " [burst <count:1>] [verbose]",
   .is_mp_safe = 1,
 };
 /* *INDENT-ON* */