diff options
| author | Matias Elo <matias.elo@nokia.com> | 2018-07-09 15:34:56 +0300 |
|---|---|---|
| committer | Matias Elo <matias.elo@nokia.com> | 2018-07-11 12:59:12 +0300 |
| commit | 4a179fbc689326d0b3f115799bf8ea48bcf9e4a4 (patch) | |
| tree | 96f1af50a75f803470ffef5cdd4bb326c4a35b96 | |
| parent | 86d41dbb734ff073578d12f42582951882f1bc11 (diff) | |
Port f426dbf3 "linux-gen: pktio: remove separate API inlining header"
Signed-off-by: Matias Elo <matias.elo@nokia.com>
4 files changed, 3 insertions, 4 deletions
diff --git a/platform/linux-dpdk/Makefile.am b/platform/linux-dpdk/Makefile.am index 3ab982b08..8a460c7e1 100644 --- a/platform/linux-dpdk/Makefile.am +++ b/platform/linux-dpdk/Makefile.am @@ -32,7 +32,6 @@ odpapiplatinclude_HEADERS = \ include/odp/api/plat/packet_inlines.h \ include/odp/api/plat/packet_inlines_api.h \ include/odp/api/plat/pktio_inlines.h \ - include/odp/api/plat/pktio_inlines_api.h \ include/odp/api/plat/pool_inline_types.h \ include/odp/api/plat/std_clib_inlines.h \ include/odp/api/plat/strong_types.h \ diff --git a/platform/linux-dpdk/include-abi/odp/api/abi/packet.h b/platform/linux-dpdk/include-abi/odp/api/abi/packet.h index 3b2732609..5b34a585b 100644 --- a/platform/linux-dpdk/include-abi/odp/api/abi/packet.h +++ b/platform/linux-dpdk/include-abi/odp/api/abi/packet.h @@ -76,8 +76,8 @@ typedef enum { #define ODP_NUM_PACKET_COLORS 3 -#define _ODP_INLINE static inline #include <odp/api/plat/packet_inlines.h> +#define _ODP_INLINE static inline #include <odp/api/plat/packet_inlines_api.h> /** diff --git a/platform/linux-dpdk/include/odp/api/plat/packet_inlines.h b/platform/linux-dpdk/include/odp/api/plat/packet_inlines.h index 32d9733a6..7d80437bb 100644 --- a/platform/linux-dpdk/include/odp/api/plat/packet_inlines.h +++ b/platform/linux-dpdk/include/odp/api/plat/packet_inlines.h @@ -123,7 +123,7 @@ static inline int _odp_packet_input_index(odp_packet_t pkt) { odp_pktio_t pktio = _odp_packet_input(pkt); - return _odp_pktio_index(pktio); + return odp_pktio_index(pktio); } static inline int _odp_packet_num_segs(odp_packet_t pkt) diff --git a/platform/linux-dpdk/include/odp_packet_io_internal.h b/platform/linux-dpdk/include/odp_packet_io_internal.h index 2a69468e8..583f6bf04 100644 --- a/platform/linux-dpdk/include/odp_packet_io_internal.h +++ b/platform/linux-dpdk/include/odp_packet_io_internal.h @@ -202,7 +202,7 @@ static inline pktio_entry_t *get_pktio_entry(odp_pktio_t pktio) return NULL; } - idx = _odp_pktio_index(pktio); + idx = odp_pktio_index(pktio); return pktio_entry_ptr[idx]; } |