From patchwork Fri Dec 15 09:00:18 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: 122070 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp199940qgn; Fri, 15 Dec 2017 01:02:10 -0800 (PST) X-Google-Smtp-Source: ACJfBouBOYs1y0P0/YWNkXEo4Qmh0Zxx/p9GVfY/UUUBnaMQ/JhhSgUKn2Azuc8FB9xpCM6+NpzR X-Received: by 10.200.38.33 with SMTP id u30mr21838793qtu.197.1513328530689; Fri, 15 Dec 2017 01:02:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1513328530; cv=none; d=google.com; s=arc-20160816; b=PEDm5I4wgasBvVVnuDxALWUXRigT2jvm32aruERfjEhc3daXrJPupNhKom6gj109/B TVbDakXVRdtCesSj/rbEOfCWjOyeX9qcHRDEan6XH+mns7JbUKjh2P8uI/A5JTPiW0NC EFIg3SLNyjI+M86sB2wVRfHKzyvrNsTB92QZgxy+fhSLiI9utxjRr2fRjfbupy02hdxg vYAoauQhgAN+uwC1y7Bu8fiNOierzcTjHihNaVaXvSfxXCLzFFVub1Hof0HoqdU2Pz2T ceJVIGWWWWyi/une/vrLtyiP0vpk0V6tlh/Xve3CnkV3DqYcczuCpwT/nmQ4AyJS4YCC BxCA== 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=w+7jGJVtg6esgpDsGF/HfjVgV4xtgcrlmBCWVy//fSw=; b=KNE5qXYDp1nNax4DCrwkVpsYqkve1lkNf/Fk5MzpF8BpIry74CI40vw0g/k+IyiWaK /GLR3kOtFXClMfVEWMjIK03sm46tUiuZJTpp+I0H730GEHtNPbeQ2WXQ08INWZJwdtPM Rl+rNN3hDMhj0uJqjdt7OM60cOueZJwsL+3S1rsozQWgYvxzR81nzt+esy2OCCHExeq5 lrEzJh5ebBeqtgZ3D201D/bPuYXUckFNqyrZ4HdvU/W5DQvmGTGPBaLSWlDlUJ14Dix4 /PN/YXyKLd3Ug9xzzP+DmYNc9h791bJApCgeY+G9GI7vMjzdsIVEs4vh6on0v7tJwoi2 zhKQ== 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 t185si527989qkc.442.2017.12.15.01.02.10; Fri, 15 Dec 2017 01:02:10 -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 4A1236091D; Fri, 15 Dec 2017 09:02:10 +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 7B9F56090A; Fri, 15 Dec 2017 09:01:25 +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 E308F6091B; Fri, 15 Dec 2017 09:01:12 +0000 (UTC) Received: from forward101j.mail.yandex.net (forward101j.mail.yandex.net [5.45.198.241]) by lists.linaro.org (Postfix) with ESMTPS id AD25A6085C for ; Fri, 15 Dec 2017 09:00:28 +0000 (UTC) Received: from mxback5j.mail.yandex.net (mxback5j.mail.yandex.net [IPv6:2a02:6b8:0:1619::10e]) by forward101j.mail.yandex.net (Yandex) with ESMTP id CECE11241CA7 for ; Fri, 15 Dec 2017 12:00:20 +0300 (MSK) Received: from smtp3p.mail.yandex.net (smtp3p.mail.yandex.net [2a02:6b8:0:1472:2741:0:8b6:8]) by mxback5j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id LGFl63RDwQ-0KCCnwN0; Fri, 15 Dec 2017 12:00:20 +0300 Received: by smtp3p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id CxjcB1vsyk-0KIuiADh; Fri, 15 Dec 2017 12:00:20 +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: Fri, 15 Dec 2017 12:00:18 +0300 Message-Id: <1513328418-26052-3-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1513328418-26052-1-git-send-email-odpbot@yandex.ru> References: <1513328418-26052-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 336 Subject: [lng-odp] [PATCH API-NEXT v7 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: 0588040068a50d0d15a641d091fce23214b15594 ** Merge commit sha: 360d1f4862344412fc832e1d28e6fd4ee0c8e834 **/ 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 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 *