diff options
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/avf/device.c | 2 | ||||
| -rw-r--r-- | src/plugins/dpdk/buffer.c | 2 | ||||
| -rw-r--r-- | src/plugins/marvell/pp2/pp2.c | 2 | ||||
| -rw-r--r-- | src/plugins/memif/node.c | 4 | ||||
| -rw-r--r-- | src/plugins/pppoe/pppoe.h | 2 | ||||
| -rw-r--r-- | src/plugins/vmxnet3/vmxnet3.h | 5 |
6 files changed, 9 insertions, 8 deletions
diff --git a/src/plugins/avf/device.c b/src/plugins/avf/device.c index 039a8203edb..ede4cda69bf 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_BUFFER_DATA_SIZE; + rxq->databuffer_size = vlib_bufer_get_default_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 1894df42805..d946a0e996d 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_BUFFER_DATA_SIZE; + vlib_bufer_get_default_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 ec35a0d92b7..d84d12ffa45 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_BUFFER_DATA_SIZE; + bpool_params.buff_len = vlib_bufer_get_default_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 28fd10ef7b5..0fd09883032 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_BUFFER_DATA_SIZE; + u16 buffer_size = vlib_bufer_get_default_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_BUFFER_DATA_SIZE - start_offset; + buffer_length = vlib_bufer_get_default_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 f010750f420..5e8abfb998f 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_BUFFER_DATA_SIZE - 1) / VLIB_BUFFER_DATA_SIZE) +#define MTU_BUFFERS ((MTU + vlib_bufer_get_default_size(vm) - 1) / vlib_bufer_get_default_size(vm)) #define NUM_BUFFERS_TO_ALLOC 32 /* diff --git a/src/plugins/vmxnet3/vmxnet3.h b/src/plugins/vmxnet3/vmxnet3.h index 3333f96b85b..dbe57b331c3 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_BUFFER_DATA_SIZE; + rxd->flags = ring->gen | vlib_bufer_get_default_size (vm); vmxnet3_rx_ring_advance_produce (rxq, ring); ring->fill++; @@ -660,7 +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_BUFFER_DATA_SIZE | VMXNET3_RXF_BTYPE; + rxd->flags = + ring->gen | vlib_bufer_get_default_size (vm) | VMXNET3_RXF_BTYPE; vmxnet3_rx_ring_advance_produce (rxq, ring); ring->fill++; |