diff mbox series

[API-NEXT,v5,2/6] api: pktio: use common protocol layer enum

Message ID 1510228814-21692-3-git-send-email-odpbot@yandex.ru
State New
Headers show
Series [API-NEXT,v5,1/6] api: packet: add parse functions | expand

Commit Message

Github ODP bot Nov. 9, 2017, noon UTC 
From: Petri Savolainen <petri.savolainen@linaro.org>


Use common values between pktio parser layer and
packet protocol layer enums.

Signed-off-by: Petri Savolainen <petri.savolainen@linaro.org>

---
/** Email created from pull request 273 (psavol:next-packet-parse)
 ** https://github.com/Linaro/odp/pull/273
 ** Patch: https://github.com/Linaro/odp/pull/273.patch
 ** Base sha: d22c949cc466bf28de559855a1cb525740578137
 ** Merge commit sha: 5ed52232b041f855c0e109143480b16ea467c7da
 **/
 include/odp/api/spec/packet_io.h                             | 11 ++++++-----
 platform/linux-generic/include/odp/api/plat/packet_inlines.h |  4 +++-
 2 files changed, 9 insertions(+), 6 deletions(-)
diff mbox series

Patch

diff --git a/include/odp/api/spec/packet_io.h b/include/odp/api/spec/packet_io.h
index 52af646a6..6e4f88100 100644
--- a/include/odp/api/spec/packet_io.h
+++ b/include/odp/api/spec/packet_io.h
@@ -23,6 +23,7 @@  extern "C" {
 #include <odp/api/packet_io_stats.h>
 #include <odp/api/queue.h>
 #include <odp/api/time.h>
+#include <odp/api/packet.h>
 
 /** @defgroup odp_packet_io ODP PACKET IO
  *  Operations on a packet Input/Output interface.
@@ -381,19 +382,19 @@  typedef union odp_pktout_config_opt_t {
  */
 typedef enum odp_pktio_parser_layer_t {
 	/** No layers */
-	ODP_PKTIO_PARSER_LAYER_NONE = 0,
+	ODP_PKTIO_PARSER_LAYER_NONE = ODP_PROTO_LAYER_NONE,
 
 	/** Layer L2 protocols (Ethernet, VLAN, ARP, etc) */
-	ODP_PKTIO_PARSER_LAYER_L2,
+	ODP_PKTIO_PARSER_LAYER_L2 = ODP_PROTO_LAYER_L2,
 
 	/** Layer L3 protocols (IPv4, IPv6, ICMP, IPsec, etc) */
-	ODP_PKTIO_PARSER_LAYER_L3,
+	ODP_PKTIO_PARSER_LAYER_L3 = ODP_PROTO_LAYER_L3,
 
 	/** Layer L4 protocols (UDP, TCP, SCTP) */
-	ODP_PKTIO_PARSER_LAYER_L4,
+	ODP_PKTIO_PARSER_LAYER_L4 = ODP_PROTO_LAYER_L4,
 
 	/** All layers */
-	ODP_PKTIO_PARSER_LAYER_ALL
+	ODP_PKTIO_PARSER_LAYER_ALL = ODP_PROTO_LAYER_ALL
 
 } odp_pktio_parser_layer_t;
 
diff --git a/platform/linux-generic/include/odp/api/plat/packet_inlines.h b/platform/linux-generic/include/odp/api/plat/packet_inlines.h
index 1804fa6f2..22f5aca31 100644
--- a/platform/linux-generic/include/odp/api/plat/packet_inlines.h
+++ b/platform/linux-generic/include/odp/api/plat/packet_inlines.h
@@ -15,7 +15,9 @@ 
 
 #include <odp/api/plat/packet_types.h>
 #include <odp/api/pool.h>
-#include <odp/api/packet_io.h>
+#include <odp/api/time.h>
+#include <odp/api/plat/packet_io_types.h>
+#include <odp/api/plat/buffer_types.h>
 #include <odp/api/hints.h>
 
 /** @internal Inline function offsets */