Port 346e832be "linux-gen: packet_flags: inline has error functions"

Port original commit from linux-generic.

Signed-off-by: Matias Elo <matias.elo@nokia.com>
Reviewed-by: Tuomas Taipale <tuomas.taipale@nokia.com>

2 files changed, 41 insertions, 29 deletions

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 dc975aa7e..7482fca93 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
@@ -56,6 +56,10 @@ static inline uint64_t _odp_packet_input_flags(odp_packet_t pkt)
 	#define odp_packet_has_tcp __odp_packet_has_tcp
 	#define odp_packet_has_sctp __odp_packet_has_sctp
 	#define odp_packet_has_icmp __odp_packet_has_icmp
+	#define odp_packet_has_error __odp_packet_has_error
+	#define odp_packet_has_l2_error __odp_packet_has_l2_error
+	#define odp_packet_has_l3_error __odp_packet_has_l3_error
+	#define odp_packet_has_l4_error __odp_packet_has_l4_error
 #else
 	#undef _ODP_INLINE
 	#define _ODP_INLINE
@@ -249,6 +253,43 @@ _ODP_INLINE int odp_packet_has_icmp(odp_packet_t pkt)
 	return flags.icmp;
 }
 
+_ODP_INLINE int odp_packet_has_error(odp_packet_t pkt)
+{
+	_odp_packet_flags_t flags;
+
+	flags.all_flags = _odp_pkt_get(pkt, uint32_t, flags);
+	return flags.all.error != 0;
+}
+
+_ODP_INLINE int odp_packet_has_l2_error(odp_packet_t pkt)
+{
+	_odp_packet_flags_t flags;
+
+	flags.all_flags = _odp_pkt_get(pkt, uint32_t, flags);
+
+	/* L2 parsing is always done by default and hence
+	no additional check is required. */
+	return flags.snap_len_err;
+}
+
+_ODP_INLINE int odp_packet_has_l3_error(odp_packet_t pkt)
+{
+	_odp_packet_flags_t flags;
+
+	flags.all_flags = _odp_pkt_get(pkt, uint32_t, flags);
+
+	return flags.ip_err;
+}
+
+_ODP_INLINE int odp_packet_has_l4_error(odp_packet_t pkt)
+{
+	_odp_packet_flags_t flags;
+
+	flags.all_flags = _odp_pkt_get(pkt, uint32_t, flags);
+
+	return flags.tcp_err | flags.udp_err;
+}
+
 /** @endcond */
 
 #ifdef __cplusplus
diff --git a/platform/linux-dpdk/odp_packet_flags.c b/platform/linux-dpdk/odp_packet_flags.c
index bc43bfaa6..728df157a 100644
--- a/platform/linux-dpdk/odp_packet_flags.c
+++ b/platform/linux-dpdk/odp_packet_flags.c
@@ -13,35 +13,6 @@
 	pkt_hdr->p.x = (v) & 1;				 \
 	} while (0)
 
-int odp_packet_has_error(odp_packet_t pkt)
-{
-	odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt);
-
-	return pkt_hdr->p.flags.all.error != 0;
-}
-
-int odp_packet_has_l2_error(odp_packet_t pkt)
-{
-	odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt);
-	/* L2 parsing is always done by default and hence
-	no additional check is required */
-	return pkt_hdr->p.flags.snap_len_err;
-}
-
-int odp_packet_has_l3_error(odp_packet_t pkt)
-{
-	odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt);
-
-	return pkt_hdr->p.flags.ip_err;
-}
-
-int odp_packet_has_l4_error(odp_packet_t pkt)
-{
-	odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt);
-
-	return pkt_hdr->p.flags.tcp_err | pkt_hdr->p.flags.udp_err;
-}
-
 void odp_packet_color_set(odp_packet_t pkt, odp_packet_color_t color)
 {
 	odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt);