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 <[email protected]>

diff --git a/vlib/vlib/buffer_funcs.h b/vlib/vlib/buffer_funcs.h
index ed96df8..d3ad89e 100644 (file)
--- 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,