This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "".
The branch, api-next has been updated via 6ce267197a66180042916368a469ed9dcc33eaa7 (commit) from d025907602c5cae0f46b8b5219bf392bdba8dc21 (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit 6ce267197a66180042916368a469ed9dcc33eaa7 Author: Maxim Uvarov maxim.uvarov@linaro.org Date: Wed Apr 19 10:56:21 2017 +0300
Revert "api: ipsec: factor out definitions for feature support levels"
This reverts commit d025907602c5 ("api: ipsec: factor out definitions for feature support levels") Petri rejected this patch and plan write some common solution
Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org
diff --git a/include/odp/api/spec/feature.h b/include/odp/api/spec/feature.h deleted file mode 100644 index 7ee2ae04..00000000 --- a/include/odp/api/spec/feature.h +++ /dev/null @@ -1,53 +0,0 @@ -/* Copyright (c) 2017, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -/** - * @file - * - * ODP feature API - */ - -#ifndef ODP_API_FEATURE_H_ -#define ODP_API_FEATURE_H_ -#include <odp/visibility_begin.h> - -#ifdef __cplusplus -extern "C" { -#endif - -/** @defgroup odp_feature ODP feature - * Common API - * @{ - */ - -/** - * ODP feature support - */ -typedef enum odp_feature_t { - /** - * Feature is not supported - */ - ODP_FEATURE_UNSUPPORTED, - /** - * Feature is supported - */ - ODP_FEATURE_SUPPORTED, - /** - * Feature is supported and preferred - */ - ODP_FEATURE_PREFERRED -} odp_feature_t; - -/** - * @} - */ - -#ifdef __cplusplus -} -#endif - -#include <odp/visibility_end.h> -#endif diff --git a/include/odp/api/spec/ipsec.h b/include/odp/api/spec/ipsec.h index e15eb590..a0ceb11a 100644 --- a/include/odp/api/spec/ipsec.h +++ b/include/odp/api/spec/ipsec.h @@ -19,7 +19,6 @@ extern "C" { #endif
#include <odp/api/crypto.h> -#include <odp/api/feature.h> #include <odp/api/packet_io.h> #include <odp/api/classification.h>
@@ -231,22 +230,38 @@ typedef struct odp_ipsec_capability_t { /** Maximum number of IPSEC SAs */ uint32_t max_num_sa;
- /** Synchronous IPSEC operation mode (ODP_IPSEC_OP_MODE_SYNC) support */ - odp_feature_t op_mode_sync; + /** Synchronous IPSEC operation mode (ODP_IPSEC_OP_MODE_SYNC) support + * + * 0: Synchronous mode is not supported + * 1: Synchronous mode is supported + * 2: Synchronous mode is supported and preferred + */ + uint8_t op_mode_sync;
- /** - * Asynchronous IPSEC operation mode (ODP_IPSEC_OP_MODE_ASYNC) support + /** Asynchronous IPSEC operation mode (ODP_IPSEC_OP_MODE_ASYNC) support + * + * 0: Asynchronous mode is not supported + * 1: Asynchronous mode is supported + * 2: Asynchronous mode is supported and preferred */ - odp_feature_t op_mode_async; + uint8_t op_mode_async;
- /** Inline IPSEC operation mode (ODP_IPSEC_OP_MODE_INLINE) support */ - odp_feature_t op_mode_inline; + /** Inline IPSEC operation mode (ODP_IPSEC_OP_MODE_INLINE) support + * + * 0: Inline IPSEC operation is not supported + * 1: Inline IPSEC operation is supported + * 2: Inline IPSEC operation is supported and preferred + */ + uint8_t op_mode_inline;
- /** - * Support of pipelined classification (ODP_IPSEC_PIPELINE_CLS) of - * resulting inbound packets + /** Support of pipelined classification (ODP_IPSEC_PIPELINE_CLS) of + * resulting inbound packets. + * + * 0: Classification of resulting packets is not supported + * 1: Classification of resulting packets is supported + * 2: Classification of resulting packets is supported and preferred */ - odp_feature_t pipeline_cls; + uint8_t pipeline_cls;
/** Soft expiry limit in seconds support * diff --git a/include/odp_api.h b/include/odp_api.h index b736fb88..73e5309a 100644 --- a/include/odp_api.h +++ b/include/odp_api.h @@ -57,7 +57,6 @@ extern "C" { #include <odp/api/spinlock_recursive.h> #include <odp/api/rwlock_recursive.h> #include <odp/api/std_clib.h> -#include <odp/api/feature.h> #include <odp/api/ipsec.h>
#ifdef __cplusplus diff --git a/platform/Makefile.inc b/platform/Makefile.inc index 5a63b24b..874cf887 100644 --- a/platform/Makefile.inc +++ b/platform/Makefile.inc @@ -31,7 +31,6 @@ odpapispecinclude_HEADERS = \ $(top_srcdir)/include/odp/api/spec/debug.h \ $(top_srcdir)/include/odp/api/spec/errno.h \ $(top_srcdir)/include/odp/api/spec/event.h \ - $(top_srcdir)/include/odp/api/spec/feature.h \ $(top_srcdir)/include/odp/api/spec/hash.h \ $(top_srcdir)/include/odp/api/spec/hints.h \ $(top_srcdir)/include/odp/api/spec/init.h \ diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 95f6369c..0d5299cb 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -37,7 +37,6 @@ odpapiinclude_HEADERS = \ $(srcdir)/include/odp/api/debug.h \ $(srcdir)/include/odp/api/errno.h \ $(srcdir)/include/odp/api/event.h \ - $(srcdir)/include/odp/api/feature.h \ $(srcdir)/include/odp/api/hash.h \ $(srcdir)/include/odp/api/hints.h \ $(srcdir)/include/odp/api/init.h \ diff --git a/platform/linux-generic/include/odp/api/feature.h b/platform/linux-generic/include/odp/api/feature.h deleted file mode 100644 index d0aa8179..00000000 --- a/platform/linux-generic/include/odp/api/feature.h +++ /dev/null @@ -1,34 +0,0 @@ -/* Copyright (c) 2017, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -/** - * @file - * - * ODP feature API - platform specific header - */ - -#ifndef ODP_PLAT_FEATURE_H_ -#define ODP_PLAT_FEATURE_H_ - -#ifdef __cplusplus -extern "C" { -#endif - -/** @ingroup odp_feature - * @{ - */ - -/** - * @} - */ - -#include <odp/api/spec/feature.h> - -#ifdef __cplusplus -} -#endif - -#endif
-----------------------------------------------------------------------
Summary of changes: include/odp/api/spec/feature.h | 53 ------------------------ include/odp/api/spec/ipsec.h | 39 +++++++++++------ include/odp_api.h | 1 - platform/Makefile.inc | 1 - platform/linux-generic/Makefile.am | 1 - platform/linux-generic/include/odp/api/feature.h | 34 --------------- 6 files changed, 27 insertions(+), 102 deletions(-) delete mode 100644 include/odp/api/spec/feature.h delete mode 100644 platform/linux-generic/include/odp/api/feature.h
hooks/post-receive