From: Damjan Marion <damarion@cisco.com>
Date: Thu, 7 Jul 2016 14:20:13 +0000 (+0200)
Subject: Remove duplicate code buffer_func.h
X-Git-Tag: v16.09-rc1~199
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=57bf403b34bcfda628c02e583e3c9c6bd80827b4;p=vpp.git

Remove duplicate code buffer_func.h

Change-Id: I57e442b1f3486c5e8caac9d2e288869ee10f37b8
Signed-off-by: Damjan Marion <damarion@cisco.com>
---

diff --git a/vlib/vlib/buffer_funcs.h b/vlib/vlib/buffer_funcs.h
index 1c3ffe2a6e8..ed96df80e31 100644
--- a/vlib/vlib/buffer_funcs.h
+++ b/vlib/vlib/buffer_funcs.h
@@ -491,11 +491,7 @@ vlib_buffer_chain_append_data(vlib_main_t *vm,
   u32 n_buffer_bytes = vlib_buffer_free_list_buffer_size (vm, free_list_index);
   ASSERT(n_buffer_bytes >= last->current_length + last->current_data);
   u16 len = clib_min(data_len, n_buffer_bytes - last->current_length - last->current_data);
-#if DPDK == 1
-  clib_memcpy(vlib_buffer_get_current (last) + last->current_length, data, len);
-#else
   clib_memcpy(vlib_buffer_get_current (last) + last->current_length, data, len);
-#endif
   vlib_buffer_chain_increase_length(first, last, len);
   return len;
 }