diff mbox series

[API-NEXT,v7,2/2] api: ipsec: drop odp_ipsec_proto_layer_t

Message ID 1513328418-26052-3-git-send-email-odpbot@yandex.ru
State New
Headers show
Series [API-NEXT,v7,1/2] api: ipsec: use odp_proto_layer_t for parse layer spec | expand

Commit Message

Github ODP bot Dec. 15, 2017, 9 a.m. UTC 
From: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov@linaro.org>


Use odp_proto_layer_t to specify outer header retention level. Drop
separate odp_ipsec_proto_layer_t.

Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov@linaro.org>

---
/** Email created from pull request 336 (lumag:ipsec-proto-layer)
 ** https://github.com/Linaro/odp/pull/336
 ** Patch: https://github.com/Linaro/odp/pull/336.patch
 ** Base sha: 0588040068a50d0d15a641d091fce23214b15594
 ** Merge commit sha: 360d1f4862344412fc832e1d28e6fd4ee0c8e834
 **/
 include/odp/api/spec/ipsec.h | 39 +++++++++------------------------------
 1 file changed, 9 insertions(+), 30 deletions(-)
diff mbox series

Patch

diff --git a/include/odp/api/spec/ipsec.h b/include/odp/api/spec/ipsec.h
index c67954689..4f8748a61 100644
--- a/include/odp/api/spec/ipsec.h
+++ b/include/odp/api/spec/ipsec.h
@@ -69,27 +69,6 @@  typedef enum odp_ipsec_op_mode_t {
 
 } odp_ipsec_op_mode_t;
 
-/**
- * Protocol layers in IPSEC configuration
- */
-typedef enum odp_ipsec_proto_layer_t {
-	/** No layers */
-	ODP_IPSEC_LAYER_NONE = ODP_PROTO_LAYER_NONE,
-
-	/** Layer L2 protocols (Ethernet, VLAN, etc) */
-	ODP_IPSEC_LAYER_L2 = ODP_PROTO_LAYER_L2,
-
-	/** Layer L3 protocols (IPv4, IPv6, ICMP, IPSEC, etc) */
-	ODP_IPSEC_LAYER_L3 = ODP_PROTO_LAYER_L3,
-
-	/** Layer L4 protocols (UDP, TCP, SCTP) */
-	ODP_IPSEC_LAYER_L4 = ODP_PROTO_LAYER_L4,
-
-	/** All layers */
-	ODP_IPSEC_LAYER_ALL = ODP_PROTO_LAYER_ALL
-
-} odp_ipsec_proto_layer_t;
-
 /**
  * Configuration options for IPSEC inbound processing
  */
@@ -125,25 +104,25 @@  typedef struct odp_ipsec_inbound_config_t {
 	 *
 	 *  Select up to which protocol layer (at least) outer headers are
 	 *  retained in inbound inline processing. Default value is
-	 *  ODP_IPSEC_LAYER_NONE.
+	 *  ODP_PROTO_LAYER_NONE.
 	 *
-	 *  ODP_IPSEC_LAYER_NONE: Application does not require any outer
+	 *  ODP_PROTO_LAYER_NONE: Application does not require any outer
 	 *                        headers to be retained.
 	 *
-	 *  ODP_IPSEC_LAYER_L2:   Retain headers up to layer 2.
+	 *  ODP_PROTO_LAYER_L2:   Retain headers up to layer 2.
 	 *
-	 *  ODP_IPSEC_LAYER_L3:   Retain headers up to layer 3, otherwise the
-	 *                        same as ODP_IPSEC_LAYER_ALL.
+	 *  ODP_PROTO_LAYER_L3:   Retain headers up to layer 3, otherwise the
+	 *                        same as ODP_PROTO_LAYER_ALL.
 	 *
-	 *  ODP_IPSEC_LAYER_L4:   Retain headers up to layer 4, otherwise the
-	 *                        same as ODP_IPSEC_LAYER_ALL.
+	 *  ODP_PROTO_LAYER_L4:   Retain headers up to layer 4, otherwise the
+	 *                        same as ODP_PROTO_LAYER_ALL.
 	 *
-	 *  ODP_IPSEC_LAYER_ALL:  In tunnel mode, all headers before IPSEC are
+	 *  ODP_PROTO_LAYER_ALL:  In tunnel mode, all headers before IPSEC are
 	 *                        retained. In transport mode, all headers
 	 *                        before IP (carrying IPSEC) are retained.
 	 *
 	 */
-	odp_ipsec_proto_layer_t retain_outer;
+	odp_proto_layer_t retain_outer;
 
 	/** Parse packet headers after IPSEC transformation
 	 *