From patchwork Tue Dec 12 17:00:20 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 121569 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp4372576qgn; Tue, 12 Dec 2017 09:01:33 -0800 (PST) X-Google-Smtp-Source: ACJfBovYiz9M9XXFLsPfY32i32Y72OXPVx0NpaT2xdx0+7CyA1LQEizRlA6j6DyZ4MoGd3aGdtPV X-Received: by 10.55.178.134 with SMTP id b128mr6261248qkf.21.1513098093514; Tue, 12 Dec 2017 09:01:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1513098093; cv=none; d=google.com; s=arc-20160816; b=y4+4rOS5+PWYJgadfKWWIA1wD6O0vWRBYdiPTls8o4EEOQ0r9S08AoZkdS5H5X+8uv ZWqSIODZ8N8+lKOaYs9gbUuvRGIdGBQzvyUpvHWOEylvpqstpVTqJxAXL685NoYPtQJ0 6nnU1r8SEpo0Vy5laRFYVXO7ssjieEFUACb9xrpGjNNZU5hJcaFPX1yoXEdf8MXKVfOf 3wwD1yW11GOSBvvxyCB9ZinHY1UtVj4TfY/c+1KX1gAisJLqW5Z4+035QWBiKY4uBep0 Go5QxCjRBEZixlHtqIfM7nFHCGuB8L6vC91Mv4y4/JTXqanKWUb+QYB+dNWiAoFYO8pN K2zg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:github-pr-num :references:in-reply-to:message-id:date:to:from:delivered-to :arc-authentication-results; bh=vm+2Va/wl/kaACggHoqqBKNfY1lcya0/2Ki/J7VV2qo=; b=lhZzqcOI/ugEW44h+rZE6nmqCrwskTf3gq1dInZVnb+EKnLk8u3FSHaigLaTgERwKN 0MxA5IEI5gQEifmtsklrwTeg0V7HRrSUePgNML+JZVsInnI7vYwnxBCVtxWufxurnOd4 cNCLdQzOZyYygxqNiYSFHQhtHDpcMHtxoQ3qYgHW8Oh+PcGTN5PrUwl4S93F/vBGRyoF jU2H/h0xYU+X4K5fVnzAdmfQYqkz1AJbcOogo5qp4jL7H0ccgbh6I2a26reIIGn/KpQp BBhQFJ4QZRbLNILNift+sv0CdZm+tAFArzc493ozdBpnA8ZqeTX4IU4emau1/paOagq4 hfug== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Return-Path: Received: from lists.linaro.org (ec2-54-197-127-237.compute-1.amazonaws.com. [54.197.127.237]) by mx.google.com with ESMTP id l1si551339qkk.303.2017.12.12.09.01.30; Tue, 12 Dec 2017 09:01:33 -0800 (PST) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) client-ip=54.197.127.237; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: by lists.linaro.org (Postfix, from userid 109) id 00460607E4; Tue, 12 Dec 2017 17:01:29 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 4D0DD60825; Tue, 12 Dec 2017 17:00:56 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 51B2A607C5; Tue, 12 Dec 2017 17:00:48 +0000 (UTC) Received: from forward106j.mail.yandex.net (forward106j.mail.yandex.net [5.45.198.249]) by lists.linaro.org (Postfix) with ESMTPS id 875CD60646 for ; Tue, 12 Dec 2017 17:00:39 +0000 (UTC) Received: from mxback2g.mail.yandex.net (mxback2g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:163]) by forward106j.mail.yandex.net (Yandex) with ESMTP id 884CD18011D3 for ; Tue, 12 Dec 2017 20:00:37 +0300 (MSK) Received: from smtp4o.mail.yandex.net (smtp4o.mail.yandex.net [2a02:6b8:0:1a2d::28]) by mxback2g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id aBHHMpE3hv-0bNOWGIU; Tue, 12 Dec 2017 20:00:37 +0300 Received: by smtp4o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id jq56e5t2BB-0asuwx4d; Tue, 12 Dec 2017 20:00:36 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client certificate not present) From: Github ODP bot To: lng-odp@lists.linaro.org Date: Tue, 12 Dec 2017 20:00:20 +0300 Message-Id: <1513098020-19696-3-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1513098020-19696-1-git-send-email-odpbot@yandex.ru> References: <1513098020-19696-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 336 Subject: [lng-odp] [PATCH API-NEXT v2 2/2] api: ipsec: drop odp_ipsec_proto_layer_t X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "The OpenDataPlane \(ODP\) List" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" From: Dmitry Eremin-Solenikov Use odp_proto_layer_t to specify outer header retention level. Drop separate odp_ipsec_proto_layer_t. Signed-off-by: Dmitry Eremin-Solenikov --- /** 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: 65d690fbcf03c6a4d5eb3f01bde36807833feaaa ** Merge commit sha: 5837f541514787dbed97ac3478e4967a53a5f9c2 **/ include/odp/api/spec/ipsec.h | 39 +++++++++------------------------------ 1 file changed, 9 insertions(+), 30 deletions(-) diff --git a/include/odp/api/spec/ipsec.h b/include/odp/api/spec/ipsec.h index 4d3aeefdc..1723cba45 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 *