aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Barach <dave@barachs.net>2016-07-07 10:35:56 -0400
committerDamjan Marion <dmarion.lists@gmail.com>2016-07-07 16:05:59 +0000
commit708357415d3b3d6d3c2df264fc1caa04ae0e0dfe (patch)
treecf23335651ca4fa1897fbc0a43d3c8d8d06ed357
parent57bf403b34bcfda628c02e583e3c9c6bd80827b4 (diff)
Remove #if DPDK == 0, to eliminate a data structure size mismatch
Otherwise, e.g. the ip4/6_main_t's change size between PLATFORM=vpp and PLATFORM=vpp_lite. That, in turn, makes it far easier to build broken plugins. Change-Id: Ic962d75b170eee698de29c4e29849ce73d27caad Signed-off-by: Dave Barach <dave@barachs.net>
-rw-r--r--vlib/vlib/buffer_funcs.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/vlib/vlib/buffer_funcs.h b/vlib/vlib/buffer_funcs.h
index ed96df80..d3ad89eb 100644
--- a/vlib/vlib/buffer_funcs.h
+++ b/vlib/vlib/buffer_funcs.h
@@ -515,7 +515,8 @@ typedef struct {
/* Vector of packet data. */
u8 * packet_data;
-#if DPDK == 0
+ /* Note: the next three fields are unused if DPDK == 1 */
+
/* Number of buffers to allocate in each call to physmem
allocator. */
u32 min_n_buffers_each_physmem_alloc;
@@ -524,7 +525,6 @@ typedef struct {
u32 free_list_index;
u32 * free_buffers;
-#endif
} vlib_packet_template_t;
void vlib_packet_template_get_packet_helper (vlib_main_t * vm,