Port d61545b5 "linux-gen: packet_flags: remove separate API inlining header"

Signed-off-by: Matias Elo <matias.elo@nokia.com>

3 files changed, 22 insertions, 60 deletions

diff --git a/platform/linux-dpdk/Makefile.am b/platform/linux-dpdk/Makefile.am
index 8a460c7e1..21a15c375 100644
--- a/platform/linux-dpdk/Makefile.am
+++ b/platform/linux-dpdk/Makefile.am
@@ -27,7 +27,6 @@ odpapiplatinclude_HEADERS = \
 		  include/odp/api/plat/byteorder_inlines_api.h \
 		  include/odp/api/plat/event_inlines.h \
 		  include/odp/api/plat/packet_flag_inlines.h \
-		  include/odp/api/plat/packet_flag_inlines_api.h \
 		  include/odp/api/plat/packet_inline_types.h \
 		  include/odp/api/plat/packet_inlines.h \
 		  include/odp/api/plat/packet_inlines_api.h \
diff --git a/platform/linux-dpdk/include/odp/api/plat/packet_flag_inlines.h b/platform/linux-dpdk/include/odp/api/plat/packet_flag_inlines.h
index 52e272f25..5505115e5 100644
--- a/platform/linux-dpdk/include/odp/api/plat/packet_flag_inlines.h
+++ b/platform/linux-dpdk/include/odp/api/plat/packet_flag_inlines.h
@@ -18,7 +18,7 @@ extern "C" {
 #endif
 
 #include <odp/api/abi/packet.h>
-#include <odp/api/plat/packet_inlines.h>
+#include <odp/api/plat/packet_inline_types.h>
 
 /** @internal Inline function offsets */
 extern const _odp_packet_inline_offset_t _odp_packet_inline;
@@ -29,8 +29,22 @@ static inline uint64_t _odp_packet_input_flags(odp_packet_t pkt)
 	return _odp_pkt_get(pkt, uint64_t, input_flags);
 }
 
+#ifndef _ODP_NO_INLINE
+	/* Inline functions by default */
+	#define _ODP_INLINE static inline
+	#define odp_packet_has_l2 __odp_packet_has_l2
+	#define odp_packet_has_eth __odp_packet_has_eth
+	#define odp_packet_has_jumbo __odp_packet_has_jumbo
+	#define odp_packet_has_flow_hash __odp_packet_has_flow_hash
+	#define odp_packet_has_flow_hash_clr __odp_packet_has_flow_hash_clr
+	#define odp_packet_has_ts __odp_packet_has_ts
+	#define odp_packet_has_ipsec __odp_packet_has_ipsec
+#else
+	#define _ODP_INLINE
+#endif
+
 /** @internal Inline function @param pkt @return */
-static inline int _odp_packet_has_l2(odp_packet_t pkt)
+_ODP_INLINE int odp_packet_has_l2(odp_packet_t pkt)
 {
 	_odp_packet_input_flags_t flags;
 
@@ -39,7 +53,7 @@ static inline int _odp_packet_has_l2(odp_packet_t pkt)
 }
 
 /** @internal Inline function @param pkt @return */
-static inline int _odp_packet_has_eth(odp_packet_t pkt)
+_ODP_INLINE int odp_packet_has_eth(odp_packet_t pkt)
 {
 	_odp_packet_input_flags_t flags;
 
@@ -48,7 +62,7 @@ static inline int _odp_packet_has_eth(odp_packet_t pkt)
 }
 
 /** @internal Inline function @param pkt @return */
-static inline int _odp_packet_has_jumbo(odp_packet_t pkt)
+_ODP_INLINE int odp_packet_has_jumbo(odp_packet_t pkt)
 {
 	_odp_packet_input_flags_t flags;
 
@@ -57,14 +71,14 @@ static inline int _odp_packet_has_jumbo(odp_packet_t pkt)
 }
 
 /** @internal Inline function @param pkt @return */
-static inline int _odp_packet_has_flow_hash(odp_packet_t pkt)
+_ODP_INLINE int odp_packet_has_flow_hash(odp_packet_t pkt)
 {
 	return _odp_pkt_get(pkt, uint64_t, ol_flags) &
 			_odp_packet_inline.rss_flag;
 }
 
 /** @internal Inline function @param pkt */
-static inline void _odp_packet_has_flow_hash_clr(odp_packet_t pkt)
+_ODP_INLINE void odp_packet_has_flow_hash_clr(odp_packet_t pkt)
 {
 	uint64_t *ol_flags = &_odp_pkt_get(pkt, uint64_t, ol_flags);
 
@@ -72,7 +86,7 @@ static inline void _odp_packet_has_flow_hash_clr(odp_packet_t pkt)
 }
 
 /** @internal Inline function @param pkt @return */
-static inline int _odp_packet_has_ts(odp_packet_t pkt)
+_ODP_INLINE int odp_packet_has_ts(odp_packet_t pkt)
 {
 	_odp_packet_input_flags_t flags;
 
@@ -81,7 +95,7 @@ static inline int _odp_packet_has_ts(odp_packet_t pkt)
 }
 
 /** @internal Inline function @param pkt @return */
-static inline int _odp_packet_has_ipsec(odp_packet_t pkt)
+_ODP_INLINE int odp_packet_has_ipsec(odp_packet_t pkt)
 {
 	_odp_packet_input_flags_t flags;
 
diff --git a/platform/linux-dpdk/include/odp/api/plat/packet_flag_inlines_api.h b/platform/linux-dpdk/include/odp/api/plat/packet_flag_inlines_api.h
deleted file mode 100644
index 1556ea325..000000000
--- a/platform/linux-dpdk/include/odp/api/plat/packet_flag_inlines_api.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/* Copyright (c) 2017-2018, Linaro Limited
- * All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-/**
- * @file
- *
- * Packet flag inline functions
- */
-
-#ifndef _ODP_PLAT_PACKET_FLAG_INLINES_API_H_
-#define _ODP_PLAT_PACKET_FLAG_INLINES_API_H_
-
-_ODP_INLINE int odp_packet_has_l2(odp_packet_t pkt)
-{
-	return _odp_packet_has_l2(pkt);
-}
-
-_ODP_INLINE int odp_packet_has_eth(odp_packet_t pkt)
-{
-	return _odp_packet_has_eth(pkt);
-}
-
-_ODP_INLINE int odp_packet_has_jumbo(odp_packet_t pkt)
-{
-	return _odp_packet_has_jumbo(pkt);
-}
-
-_ODP_INLINE int odp_packet_has_flow_hash(odp_packet_t pkt)
-{
-	return _odp_packet_has_flow_hash(pkt);
-}
-
-_ODP_INLINE void odp_packet_has_flow_hash_clr(odp_packet_t pkt)
-{
-	_odp_packet_has_flow_hash_clr(pkt);
-}
-
-_ODP_INLINE int odp_packet_has_ts(odp_packet_t pkt)
-{
-	return _odp_packet_has_ts(pkt);
-}
-
-_ODP_INLINE int odp_packet_has_ipsec(odp_packet_t pkt)
-{
-	return _odp_packet_has_ipsec(pkt);
-}
-
-#endif