diff options
| author | Petri Savolainen <petri.savolainen@linaro.org> | 2018-05-14 16:12:05 +0300 |
|---|---|---|
| committer | Maxim Uvarov <maxim.uvarov@linaro.org> | 2018-05-15 16:54:34 +0300 |
| commit | c484446b4930b5398e958f855917d54a97e6f2c7 (patch) | |
| tree | e7ae88da5eed03264fa40422ecaef5a4e2bf8790 /platform/linux-dpdk/odp_buffer.c | |
| parent | d295255c83cea92e93b1f4e9aa977fa36cfe2d98 (diff) | |
Port 49c671e8, 11207ff1, 3abbe8b7, f49289a7v1.19.0.1_DPDK_17.1
Fix build issues from the latest merge. These commits needed
porting:
49c671e8 odp: pktio: add pcapng capture capabilities
11207ff1 linux-gen: use inlined event type function
3abbe8b7 linux-gen: event: inline event_type function
f49289a7 linux-gen: buffer: remove buffer_inlines header file
Signed-off-by: Petri Savolainen <petri.savolainen@linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer@linaro.org>i
Signed-off-by: Maxim Uvarov <maxim.uvarov@linaro.org>
Diffstat (limited to 'platform/linux-dpdk/odp_buffer.c')
| -rw-r--r-- | platform/linux-dpdk/odp_buffer.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/platform/linux-dpdk/odp_buffer.c b/platform/linux-dpdk/odp_buffer.c index 59ea26f77..d3a28b1c5 100644 --- a/platform/linux-dpdk/odp_buffer.c +++ b/platform/linux-dpdk/odp_buffer.c @@ -6,14 +6,24 @@ #include <odp/api/buffer.h> #include <odp_buffer_internal.h> -#include <odp_buffer_inlines.h> #include <odp_debug_internal.h> #include <odp_pool_internal.h> +#include <odp/api/plat/buffer_inline_types.h> #include <string.h> #include <stdio.h> #include <inttypes.h> +#include <odp/visibility_begin.h> + +/* Fill in buffer header field offsets for inline functions */ +const _odp_buffer_inline_offset_t ODP_ALIGNED_CACHE +_odp_buffer_inline_offset = { + .event_type = offsetof(odp_buffer_hdr_t, event_type) +}; + +#include <odp/visibility_end.h> + odp_buffer_t odp_buffer_from_event(odp_event_t ev) { return (odp_buffer_t)ev; |