From 8934a04596d1421c35b194949b2027ca1fe71aef Mon Sep 17 00:00:00 2001
From: Damjan Marion <damarion@cisco.com>
Date: Sat, 9 Feb 2019 23:29:26 +0100
Subject: buffers: fix typo

Change-Id: I4e836244409c98739a13092ee252542a2c5fe259
Signed-off-by: Damjan Marion <damarion@cisco.com>
---
 src/plugins/avf/device.c                   |  2 +-
 src/plugins/dpdk/buffer.c                  |  2 +-
 src/plugins/marvell/pp2/pp2.c              |  2 +-
 src/plugins/memif/node.c                   |  4 ++--
 src/plugins/pppoe/pppoe.h                  |  2 +-
 src/plugins/vmxnet3/vmxnet3.h              |  6 +++---
 src/vlib/buffer.c                          | 14 ++++++++------
 src/vlib/buffer_funcs.h                    |  8 ++++----
 src/vlib/unix/mc_socket.c                  |  6 +++---
 src/vnet/devices/af_packet/node.c          |  2 +-
 src/vnet/devices/netmap/node.c             |  2 +-
 src/vnet/devices/virtio/node.c             |  2 +-
 src/vnet/devices/virtio/vhost_user_input.c |  7 +++----
 src/vnet/dhcp/dhcp6_proxy_node.c           |  2 +-
 src/vnet/ip/ip_frag.c                      |  2 +-
 src/vnet/ip/ping.c                         |  6 +++---
 src/vnet/ip/punt.c                         |  2 +-
 src/vnet/ipfix-export/flow_report.c        |  2 +-
 src/vnet/pg/cli.c                          |  2 +-
 src/vnet/pg/input.c                        |  2 +-
 src/vnet/pg/stream.c                       |  2 +-
 src/vnet/sctp/sctp.c                       |  2 +-
 src/vnet/session/session_node.c            |  2 +-
 src/vnet/tcp/tcp.c                         |  2 +-
 src/vnet/unix/tuntap.c                     |  4 ++--
 25 files changed, 45 insertions(+), 44 deletions(-)

(limited to 'src')

diff --git a/src/plugins/avf/device.c b/src/plugins/avf/device.c
index ede4cda69bf..248e3c173bd 100644
--- a/src/plugins/avf/device.c
+++ b/src/plugins/avf/device.c
@@ -594,7 +594,7 @@ avf_op_config_vsi_queues (vlib_main_t * vm, avf_device_t * ad)
 	{
 	  avf_rxq_t *q = vec_elt_at_index (ad->rxqs, i);
 	  rxq->ring_len = q->size;
-	  rxq->databuffer_size = vlib_bufer_get_default_size (vm);
+	  rxq->databuffer_size = vlib_buffer_get_default_data_size (vm);
 	  rxq->dma_ring_addr = avf_dma_addr (vm, ad, (void *) q->descs);
 	  avf_reg_write (ad, AVF_QRX_TAIL (i), q->size - 1);
 	}
diff --git a/src/plugins/dpdk/buffer.c b/src/plugins/dpdk/buffer.c
index d946a0e996d..dd7bf4cc9d1 100644
--- a/src/plugins/dpdk/buffer.c
+++ b/src/plugins/dpdk/buffer.c
@@ -74,7 +74,7 @@ dpdk_buffer_pool_init (vlib_main_t * vm, vlib_buffer_pool_t * bp)
 
   /* Call the mempool priv initializer */
   priv.mbuf_data_room_size = VLIB_BUFFER_PRE_DATA_SIZE +
-    vlib_bufer_get_default_size (vm);
+    vlib_buffer_get_default_data_size (vm);
   priv.mbuf_priv_size = VLIB_BUFFER_HDR_SIZE;
   rte_pktmbuf_pool_init (mp, &priv);
   rte_pktmbuf_pool_init (nmp, &priv);
diff --git a/src/plugins/marvell/pp2/pp2.c b/src/plugins/marvell/pp2/pp2.c
index d84d12ffa45..d40b9ec7dd6 100644
--- a/src/plugins/marvell/pp2/pp2.c
+++ b/src/plugins/marvell/pp2/pp2.c
@@ -244,7 +244,7 @@ mrvl_pp2_create_if (mrvl_pp2_create_if_args_t * args)
   /* FIXME bpool bit select per pp */
   s = format (s, "pool-%d:%d%c", pp2_id, pp2_id + 8, 0);
   bpool_params.match = (char *) s;
-  bpool_params.buff_len = vlib_bufer_get_default_size (vm);
+  bpool_params.buff_len = vlib_buffer_get_default_data_size (vm);
   /* FIXME +64 ? */
   if (pp2_bpool_init (&bpool_params, &ppif->inqs[0].bpool))
     {
diff --git a/src/plugins/memif/node.c b/src/plugins/memif/node.c
index 0fd09883032..3f4f5c57144 100644
--- a/src/plugins/memif/node.c
+++ b/src/plugins/memif/node.c
@@ -180,7 +180,7 @@ memif_device_input_inline (vlib_main_t * vm, vlib_node_runtime_t * node,
   memif_main_t *mm = &memif_main;
   memif_ring_t *ring;
   memif_queue_t *mq;
-  u16 buffer_size = vlib_bufer_get_default_size (vm);
+  u16 buffer_size = vlib_buffer_get_default_data_size (vm);
   uword n_trace = vlib_get_trace_count (vm, node);
   u16 nexts[MEMIF_RX_VECTOR_SZ], *next = nexts;
   u32 _to_next_bufs[MEMIF_RX_VECTOR_SZ], *to_next_bufs = _to_next_bufs, *bi;
@@ -570,7 +570,7 @@ memif_device_input_zc_inline (vlib_main_t * vm, vlib_node_runtime_t * node,
   /* asume that somebody will want to add ethernet header on the packet
      so start with IP header at offset 14 */
   start_offset = (mode == MEMIF_INTERFACE_MODE_IP) ? 14 : 0;
-  buffer_length = vlib_bufer_get_default_size (vm) - start_offset;
+  buffer_length = vlib_buffer_get_default_data_size (vm) - start_offset;
 
   cur_slot = mq->last_tail;
   last_slot = ring->tail;
diff --git a/src/plugins/pppoe/pppoe.h b/src/plugins/pppoe/pppoe.h
index 5e8abfb998f..471727ce893 100644
--- a/src/plugins/pppoe/pppoe.h
+++ b/src/plugins/pppoe/pppoe.h
@@ -96,7 +96,7 @@ typedef enum
 
 
 #define MTU 1500
-#define MTU_BUFFERS ((MTU + vlib_bufer_get_default_size(vm) - 1) / vlib_bufer_get_default_size(vm))
+#define MTU_BUFFERS ((MTU + vlib_buffer_get_default_data_size(vm) - 1) / vlib_buffer_get_default_data_size(vm))
 #define NUM_BUFFERS_TO_ALLOC 32
 
 /*
diff --git a/src/plugins/vmxnet3/vmxnet3.h b/src/plugins/vmxnet3/vmxnet3.h
index dbe57b331c3..ffde9f0c6f8 100644
--- a/src/plugins/vmxnet3/vmxnet3.h
+++ b/src/plugins/vmxnet3/vmxnet3.h
@@ -615,7 +615,7 @@ vmxnet3_rxq_refill_ring0 (vlib_main_t * vm, vmxnet3_device_t * vd,
       vlib_buffer_t *b = vlib_get_buffer (vm, ring->bufs[ring->produce]);
       rxd = &rxq->rx_desc[0][ring->produce];
       rxd->address = vlib_buffer_get_pa (vm, b);
-      rxd->flags = ring->gen | vlib_bufer_get_default_size (vm);
+      rxd->flags = ring->gen | vlib_buffer_get_default_data_size (vm);
 
       vmxnet3_rx_ring_advance_produce (rxq, ring);
       ring->fill++;
@@ -660,8 +660,8 @@ vmxnet3_rxq_refill_ring1 (vlib_main_t * vm, vmxnet3_device_t * vd,
       vlib_buffer_t *b = vlib_get_buffer (vm, ring->bufs[ring->produce]);
       rxd = &rxq->rx_desc[1][ring->produce];
       rxd->address = vlib_buffer_get_pa (vm, b);
-      rxd->flags =
-	ring->gen | vlib_bufer_get_default_size (vm) | VMXNET3_RXF_BTYPE;
+      rxd->flags = ring->gen | vlib_buffer_get_default_data_size (vm) |
+	VMXNET3_RXF_BTYPE;
 
       vmxnet3_rx_ring_advance_produce (rxq, ring);
       ring->fill++;
diff --git a/src/vlib/buffer.c b/src/vlib/buffer.c
index a45b9bf2fc7..c44d8e49d40 100644
--- a/src/vlib/buffer.c
+++ b/src/vlib/buffer.c
@@ -192,9 +192,10 @@ vlib_validate_buffer_helper (vlib_main_t * vm,
   if ((signed) b->current_data < (signed) -VLIB_BUFFER_PRE_DATA_SIZE)
     return format (0, "current data %d before pre-data", b->current_data);
 
-  if (b->current_data + b->current_length > vlib_bufer_get_default_size (vm))
+  if (b->current_data + b->current_length >
+      vlib_buffer_get_default_data_size (vm))
     return format (0, "%d-%d beyond end of buffer %d", b->current_data,
-		   b->current_length, vlib_bufer_get_default_size (vm));
+		   b->current_length, vlib_buffer_get_default_data_size (vm));
 
   if (follow_buffer_next && (b->flags & VLIB_BUFFER_NEXT_PRESENT))
     {
@@ -407,7 +408,7 @@ vlib_buffer_add_data (vlib_main_t * vm, u32 * buffer_index, void *data,
 
   d = data;
   n_left = n_data_bytes;
-  n_buffer_bytes = vlib_bufer_get_default_size (vm);
+  n_buffer_bytes = vlib_buffer_get_default_data_size (vm);
 
   b = vlib_get_buffer (vm, bi);
   b->flags &= ~VLIB_BUFFER_TOTAL_LENGTH_VALID;
@@ -455,7 +456,7 @@ vlib_buffer_chain_append_data_with_alloc (vlib_main_t * vm,
 					  u16 data_len)
 {
   vlib_buffer_t *l = *last;
-  u32 n_buffer_bytes = vlib_bufer_get_default_size (vm);
+  u32 n_buffer_bytes = vlib_buffer_get_default_data_size (vm);
   u16 copied = 0;
   ASSERT (n_buffer_bytes >= l->current_length + l->current_data);
   while (data_len)
@@ -655,7 +656,8 @@ vlib_buffer_main_init_numa_node (struct vlib_main_t *vm, u32 numa_node)
   u32 buffers_per_numa;
   u32 buffer_size = CLIB_CACHE_LINE_ROUND (bm->ext_hdr_size +
 					   sizeof (vlib_buffer_t) +
-					   vlib_bufer_get_default_size (vm));
+					   vlib_buffer_get_default_data_size
+					   (vm));
   u8 *name;
 
   pagesize = clib_mem_get_default_hugepage_size ();
@@ -690,7 +692,7 @@ retry:
   name = format (name, "default-numa-%d%c", numa_node, 0);
 
   return vlib_buffer_pool_create (vm, numa_node, (char *) name,
-				  vlib_bufer_get_default_size (vm),
+				  vlib_buffer_get_default_data_size (vm),
 				  physmem_map_index);
 }
 
diff --git a/src/vlib/buffer_funcs.h b/src/vlib/buffer_funcs.h
index 97b687b8cc6..1600905564c 100644
--- a/src/vlib/buffer_funcs.h
+++ b/src/vlib/buffer_funcs.h
@@ -89,7 +89,7 @@ vlib_get_buffer (vlib_main_t * vm, u32 buffer_index)
 }
 
 static_always_inline u32
-vlib_bufer_get_default_size (vlib_main_t * vm)
+vlib_buffer_get_default_data_size (vlib_main_t * vm)
 {
   return vm->buffer_main->default_data_size;
 }
@@ -1162,7 +1162,7 @@ vlib_buffer_chain_append_data (vlib_main_t * vm,
 			       vlib_buffer_t * first,
 			       vlib_buffer_t * last, void *data, u16 data_len)
 {
-  u32 n_buffer_bytes = vlib_bufer_get_default_size (vm);
+  u32 n_buffer_bytes = vlib_buffer_get_default_data_size (vm);
   ASSERT (n_buffer_bytes >= last->current_length + last->current_data);
   u16 len = clib_min (data_len,
 		      n_buffer_bytes - last->current_length -
@@ -1237,7 +1237,7 @@ vlib_buffer_chain_compress (vlib_main_t * vm,
     }
 
   u32 want_first_size = clib_min (VLIB_BUFFER_CLONE_HEAD_SIZE,
-				  vlib_bufer_get_default_size (vm) -
+				  vlib_buffer_get_default_data_size (vm) -
 				  first->current_data);
   do
     {
@@ -1284,7 +1284,7 @@ always_inline int
 vlib_buffer_chain_linearize (vlib_main_t * vm, vlib_buffer_t * first)
 {
   vlib_buffer_t *b = first;
-  u32 buf_len = vlib_bufer_get_default_size (vm);
+  u32 buf_len = vlib_buffer_get_default_data_size (vm);
   // free buffer chain starting from the second buffer
   int free_count = (b->flags & VLIB_BUFFER_NEXT_PRESENT) != 0;
   u32 chain_to_free = b->next_buffer;
diff --git a/src/vlib/unix/mc_socket.c b/src/vlib/unix/mc_socket.c
index d4f4a7fe7e3..86ee4361900 100644
--- a/src/vlib/unix/mc_socket.c
+++ b/src/vlib/unix/mc_socket.c
@@ -165,7 +165,7 @@ recvmsg_helper (mc_socket_main_t * msm,
   vlib_main_t *vm = msm->mc_main.vlib_main;
   vlib_buffer_t *b;
   uword n_left, n_alloc, n_mtu, i, i_rx;
-  const uword buffer_size = vlib_bufer_get_default_size (vm);
+  const uword buffer_size = vlib_buffer_get_default_data_size (vm);
   word n_bytes_left;
 
   /* Make sure we have at least a MTU worth of buffers. */
@@ -1012,9 +1012,9 @@ mc_socket_main_init (mc_socket_main_t * msm, char **intfc_probe_list,
 
   msm->rx_mtu_n_bytes = mtu;
   msm->rx_mtu_n_buffers =
-    msm->rx_mtu_n_bytes / vlib_bufer_get_default_size (vm);
+    msm->rx_mtu_n_bytes / vlib_buffer_get_default_data_size (vm);
   msm->rx_mtu_n_buffers +=
-    (msm->rx_mtu_n_bytes % vlib_bufer_get_default_size (vm)) != 0;
+    (msm->rx_mtu_n_bytes % vlib_buffer_get_default_data_size (vm)) != 0;
 
   error = socket_setup (msm);
   if (error)
diff --git a/src/vnet/devices/af_packet/node.c b/src/vnet/devices/af_packet/node.c
index 2fa7708ef21..2aa52e06a62 100644
--- a/src/vnet/devices/af_packet/node.c
+++ b/src/vnet/devices/af_packet/node.c
@@ -192,7 +192,7 @@ af_packet_device_input_fn (vlib_main_t * vm, vlib_node_runtime_t * node,
   u8 *block_start = apif->rx_ring + block * block_size;
   uword n_trace = vlib_get_trace_count (vm, node);
   u32 thread_index = vm->thread_index;
-  u32 n_buffer_bytes = vlib_bufer_get_default_size (vm);
+  u32 n_buffer_bytes = vlib_buffer_get_default_data_size (vm);
   u32 min_bufs = apif->rx_req->tp_frame_size / n_buffer_bytes;
 
   if (apif->per_interface_next_index != ~0)
diff --git a/src/vnet/devices/netmap/node.c b/src/vnet/devices/netmap/node.c
index 122d8c34c59..9293c0d811f 100644
--- a/src/vnet/devices/netmap/node.c
+++ b/src/vnet/devices/netmap/node.c
@@ -99,7 +99,7 @@ netmap_device_input_fn (vlib_main_t * vm, vlib_node_runtime_t * node,
   struct netmap_ring *ring;
   int cur_ring;
   u32 thread_index = vm->thread_index;
-  u32 n_buffer_bytes = vlib_bufer_get_default_size (vm);
+  u32 n_buffer_bytes = vlib_buffer_get_default_data_size (vm);
 
   if (nif->per_interface_next_index != ~0)
     next_index = nif->per_interface_next_index;
diff --git a/src/vnet/devices/virtio/node.c b/src/vnet/devices/virtio/node.c
index fc369e5aea9..6b82c418ffb 100644
--- a/src/vnet/devices/virtio/node.c
+++ b/src/vnet/devices/virtio/node.c
@@ -120,7 +120,7 @@ more:
 	((vif->type == VIRTIO_IF_TYPE_PCI) ? vlib_buffer_get_current_pa (vm,
 									 b) :
 	 pointer_to_uword (vlib_buffer_get_current (b)));
-      d->len = vlib_bufer_get_default_size (vm) + hdr_sz;
+      d->len = vlib_buffer_get_default_data_size (vm) + hdr_sz;
       d->flags = VRING_DESC_F_WRITE;
       vring->avail->ring[avail & mask] = next;
       avail++;
diff --git a/src/vnet/devices/virtio/vhost_user_input.c b/src/vnet/devices/virtio/vhost_user_input.c
index 465ec4462a8..3c3d48e9ef4 100644
--- a/src/vnet/devices/virtio/vhost_user_input.c
+++ b/src/vnet/devices/virtio/vhost_user_input.c
@@ -258,6 +258,7 @@ vhost_user_if_input (vlib_main_t * vm,
   u32 n_left_to_next, *to_next;
   u32 next_index = VNET_DEVICE_INPUT_NEXT_ETHERNET_INPUT;
   u32 n_trace = vlib_get_trace_count (vm, node);
+  u32 buffer_data_size = vlib_buffer_get_default_data_size (vm);
   u32 map_hint = 0;
   vhost_cpu_t *cpu = &vum->cpus[vm->thread_index];
   u16 copy_len = 0;
@@ -500,8 +501,7 @@ vhost_user_if_input (vlib_main_t * vm,
 	    }
 
 	  /* Get more output if necessary. Or end of packet. */
-	  if (PREDICT_FALSE
-	      (b_current->current_length == vlib_bufer_get_default_size (vm)))
+	  if (PREDICT_FALSE (b_current->current_length == buffer_data_size))
 	    {
 	      if (PREDICT_FALSE (cpu->rx_buffers_len == 0))
 		{
@@ -534,8 +534,7 @@ vhost_user_if_input (vlib_main_t * vm,
 	  vhost_copy_t *cpy = &cpu->copy[copy_len];
 	  copy_len++;
 	  u32 desc_data_l = desc_table[desc_current].len - desc_data_offset;
-	  cpy->len =
-	    vlib_bufer_get_default_size (vm) - b_current->current_length;
+	  cpy->len = buffer_data_size - b_current->current_length;
 	  cpy->len = (cpy->len > desc_data_l) ? desc_data_l : cpy->len;
 	  cpy->dst = (uword) (vlib_buffer_get_current (b_current) +
 			      b_current->current_length);
diff --git a/src/vnet/dhcp/dhcp6_proxy_node.c b/src/vnet/dhcp/dhcp6_proxy_node.c
index e4464e0b307..3958af86c20 100644
--- a/src/vnet/dhcp/dhcp6_proxy_node.c
+++ b/src/vnet/dhcp/dhcp6_proxy_node.c
@@ -316,7 +316,7 @@ dhcpv6_proxy_to_server_input (vlib_main_t * vm,
 	link_address_set:
 
 	  if ((b0->current_length + sizeof (*id1) + sizeof (*vss1) +
-	       sizeof (*cmac)) > vlib_bufer_get_default_size (vm))
+	       sizeof (*cmac)) > vlib_buffer_get_default_data_size (vm))
 	    {
 	      error0 = DHCPV6_PROXY_ERROR_PKT_TOO_BIG;
 	      next0 = DHCPV6_PROXY_TO_SERVER_INPUT_NEXT_DROP;
diff --git a/src/vnet/ip/ip_frag.c b/src/vnet/ip/ip_frag.c
index 6ecaa3c4dce..fd5bc6fa0ba 100644
--- a/src/vnet/ip/ip_frag.c
+++ b/src/vnet/ip/ip_frag.c
@@ -106,7 +106,7 @@ ip4_frag_do_fragment (vlib_main_t * vm, u32 from_bi, u32 ** buffer,
 
   rem = clib_net_to_host_u16 (ip4->length) - sizeof (ip4_header_t);
   max =
-    (clib_min (mtu, vlib_bufer_get_default_size (vm)) -
+    (clib_min (mtu, vlib_buffer_get_default_data_size (vm)) -
      sizeof (ip4_header_t)) & ~0x7;
 
   if (rem >
diff --git a/src/vnet/ip/ping.c b/src/vnet/ip/ping.c
index 90314b541c4..2376d9a2f5b 100755
--- a/src/vnet/ip/ping.c
+++ b/src/vnet/ip/ping.c
@@ -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_bufer_get_default_size (vm) - 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,8 +403,8 @@ init_icmp46_echo_request (vlib_main_t * vm, vlib_buffer_t * b0,
     {
       int this_buf_data_len =
 	remaining_data_len <
-	vlib_bufer_get_default_size (vm) ? remaining_data_len :
-	vlib_bufer_get_default_size (vm);
+	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)
 	{
diff --git a/src/vnet/ip/punt.c b/src/vnet/ip/punt.c
index 8331a876dcb..6e2fcebf69e 100644
--- a/src/vnet/ip/punt.c
+++ b/src/vnet/ip/punt.c
@@ -497,7 +497,7 @@ format_punt_trace (u8 * s, va_list * va)
 static uword
 punt_socket_rx_fd (vlib_main_t * vm, vlib_node_runtime_t * node, u32 fd)
 {
-  const uword buffer_size = vlib_bufer_get_default_size (vm);
+  const uword buffer_size = vlib_buffer_get_default_data_size (vm);
   u32 n_trace = vlib_get_trace_count (vm, node);
   u32 next = node->cached_next_index;
   u32 n_left_to_next, next_index;
diff --git a/src/vnet/ipfix-export/flow_report.c b/src/vnet/ipfix-export/flow_report.c
index 9d0834b36b6..103392ad81e 100644
--- a/src/vnet/ipfix-export/flow_report.c
+++ b/src/vnet/ipfix-export/flow_report.c
@@ -121,7 +121,7 @@ send_template_packet (flow_report_main_t * frm,
   /* Initialize the buffer */
   VLIB_BUFFER_TRACE_TRAJECTORY_INIT (b0);
 
-  ASSERT (vec_len (fr->rewrite) < vlib_bufer_get_default_size (vm));
+  ASSERT (vec_len (fr->rewrite) < vlib_buffer_get_default_data_size (vm));
 
   clib_memcpy_fast (b0->data, fr->rewrite, vec_len (fr->rewrite));
   b0->current_data = 0;
diff --git a/src/vnet/pg/cli.c b/src/vnet/pg/cli.c
index 4053887633d..803db129e00 100644
--- a/src/vnet/pg/cli.c
+++ b/src/vnet/pg/cli.c
@@ -341,7 +341,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_bufer_get_default_size (vm);
+  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)
diff --git a/src/vnet/pg/input.c b/src/vnet/pg/input.c
index 6ef813f5807..138a5757c83 100644
--- a/src/vnet/pg/input.c
+++ b/src/vnet/pg/input.c
@@ -1199,7 +1199,7 @@ pg_stream_fill_replay (pg_main_t * pg, pg_stream_t * s, u32 n_alloc)
   u32 *buffers;
   vlib_main_t *vm = vlib_get_main ();
   vnet_main_t *vnm = vnet_get_main ();
-  u32 buf_sz = vlib_bufer_get_default_size (vm);
+  u32 buf_sz = vlib_buffer_get_default_data_size (vm);
   vnet_interface_main_t *im = &vnm->interface_main;
   vnet_sw_interface_t *si;
 
diff --git a/src/vnet/pg/stream.c b/src/vnet/pg/stream.c
index ba24912780b..c60c5845af6 100644
--- a/src/vnet/pg/stream.c
+++ b/src/vnet/pg/stream.c
@@ -437,7 +437,7 @@ pg_stream_add (pg_main_t * pg, pg_stream_t * s_init)
   {
     int n;
 
-    s->buffer_bytes = vlib_bufer_get_default_size (vm);
+    s->buffer_bytes = vlib_buffer_get_default_data_size (vm);
     n = s->max_packet_bytes / s->buffer_bytes;
     n += (s->max_packet_bytes % s->buffer_bytes) != 0;
 
diff --git a/src/vnet/sctp/sctp.c b/src/vnet/sctp/sctp.c
index 21cc78bccca..f84996186e0 100644
--- a/src/vnet/sctp/sctp.c
+++ b/src/vnet/sctp/sctp.c
@@ -892,7 +892,7 @@ sctp_main_enable (vlib_main_t * vm)
   vec_validate (tm->ip_lookup_tx_frames[0], num_threads - 1);
   vec_validate (tm->ip_lookup_tx_frames[1], num_threads - 1);
 
-  tm->bytes_per_buffer = vlib_bufer_get_default_size (vm);
+  tm->bytes_per_buffer = vlib_buffer_get_default_data_size (vm);
 
   vec_validate (tm->time_now, num_threads - 1);
   return error;
diff --git a/src/vnet/session/session_node.c b/src/vnet/session/session_node.c
index 09adc596d23..2a8d9720069 100644
--- a/src/vnet/session/session_node.c
+++ b/src/vnet/session/session_node.c
@@ -605,7 +605,7 @@ session_tx_set_dequeue_params (vlib_main_t * vm, session_tx_context_t * ctx,
       ctx->max_len_to_snd = max_segs * ctx->snd_mss;
     }
 
-  n_bytes_per_buf = vlib_bufer_get_default_size (vm);
+  n_bytes_per_buf = vlib_buffer_get_default_data_size (vm);
   ASSERT (n_bytes_per_buf > TRANSPORT_MAX_HDRS_LEN);
   n_bytes_per_seg = TRANSPORT_MAX_HDRS_LEN + ctx->snd_mss;
   ctx->n_bufs_per_seg = ceil ((f64) n_bytes_per_seg / n_bytes_per_buf);
diff --git a/src/vnet/tcp/tcp.c b/src/vnet/tcp/tcp.c
index ee5f27579b3..81f209b5d7c 100644
--- a/src/vnet/tcp/tcp.c
+++ b/src/vnet/tcp/tcp.c
@@ -1476,7 +1476,7 @@ tcp_main_enable (vlib_main_t * vm)
   tcp_initialize_timer_wheels (tm);
   tcp_initialize_iss_seed (tm);
 
-  tm->bytes_per_buffer = vlib_bufer_get_default_size (vm);
+  tm->bytes_per_buffer = vlib_buffer_get_default_data_size (vm);
 
   return error;
 }
diff --git a/src/vnet/unix/tuntap.c b/src/vnet/unix/tuntap.c
index ce7b260f393..103b6496a34 100644
--- a/src/vnet/unix/tuntap.c
+++ b/src/vnet/unix/tuntap.c
@@ -243,7 +243,7 @@ tuntap_rx (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame)
   tuntap_main_t *tm = &tuntap_main;
   vlib_buffer_t *b;
   u32 bi;
-  const uword buffer_size = vlib_bufer_get_default_size (vm);
+  const uword buffer_size = vlib_buffer_get_default_data_size (vm);
   u16 thread_index = vm->thread_index;
 
   /** Make sure we have some RX buffers. */
@@ -490,7 +490,7 @@ tuntap_config (vlib_main_t * vm, unformat_input_t * input)
   u8 *name;
   int flags = IFF_TUN | IFF_NO_PI;
   int is_enabled = 0, is_ether = 0, have_normal_interface = 0;
-  const uword buffer_size = vlib_bufer_get_default_size (vm);
+  const uword buffer_size = vlib_buffer_get_default_data_size (vm);
 
   while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
     {
-- 
cgit 1.2.3-korg