From patchwork Wed Dec 13 14:00:11 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: 121774 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp5508545qgn; Wed, 13 Dec 2017 06:01:14 -0800 (PST) X-Google-Smtp-Source: ACJfBouYg7Ya6FkqY4I6K6XkqTF8MNTdkjaYxvdkYQ0b71LBPLFy1tmkbJf4cfMD0EGe5ms9uSS+ X-Received: by 10.200.52.137 with SMTP id w9mr11079278qtb.290.1513173674064; Wed, 13 Dec 2017 06:01:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1513173674; cv=none; d=google.com; s=arc-20160816; b=BhdBnZGjsj8uvfCjd38llsKtEYsS70oyMyPfx1OVFz44A69gDySkeIXSUj8LkQDyEp HoTnheGWKME9/kYKcCuEMXIYRKKuvJOev4t2DwdNdLZEjPOxoe4cbuetmn49unO4ok+1 AQp9PZ2zwGoHoi2xNDFXAjpmLLuvxYVwg0z06aSaseKHEp/o1yGvzMGHjrw+ttOd5zyv xAElNQne4IRTB5RPTIyBFNyOQGJMf/u1YenS+7RCA+mReLDCzrh1cgifux391S449hB/ 0w59+/FiKy3kS6ix5dW4Sf02ydk3yx3oamtitAhrqX0apTM2hjtCVF3xJicnfGhOWiQm QRiQ== 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=85GTcrYiPSliDPZQI0cgEweKezMJ/ZCddNQahzCaGb4=; b=NHreywQS5LpnNHwAYB2hagAkhW7x1Fm33YC77EknEbD1NSNLLeGcTwmbV83HlWEr6e 6lPCRWttzCdMYqx7PZDuIPOy4NWN++pvbQvjxbKVrf40eczv5GqG4E3BODj/resB9SWM RJXofQDINkKVwD2S0IpWPkAbqH/pE0O7gWn07eXqQ+E1DYh5+KGsBuo4g4gyKwObw4Rm EZMcGM/FgxSF7eoWwtXTGudOkyj+k6GvDuNOGfAnSGsKAleiA5hjQiSaHk16vsP/JHNb aUiPncbGP3Se//TkCPPa26/ZcYkUZQ43RV3uqhGiquQVjLWYnOxhToNy/17sgFaxEJZa RpQA== 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 x42si1505945qta.256.2017.12.13.06.01.13; Wed, 13 Dec 2017 06:01:14 -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 96400607AD; Wed, 13 Dec 2017 14:01:13 +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 3695360800; Wed, 13 Dec 2017 14:00:24 +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 35F9C607AD; Wed, 13 Dec 2017 14:00:21 +0000 (UTC) Received: from forward102p.mail.yandex.net (forward102p.mail.yandex.net [77.88.28.102]) by lists.linaro.org (Postfix) with ESMTPS id 7FA39607AD for ; Wed, 13 Dec 2017 14:00:15 +0000 (UTC) Received: from mxback19j.mail.yandex.net (mxback19j.mail.yandex.net [IPv6:2a02:6b8:0:1619::95]) by forward102p.mail.yandex.net (Yandex) with ESMTP id 63A1B43059F6 for ; Wed, 13 Dec 2017 17:00:14 +0300 (MSK) Received: from smtp4j.mail.yandex.net (smtp4j.mail.yandex.net [2a02:6b8:0:1619::15:6]) by mxback19j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id DqccFBp7gI-0EYeHhh7; Wed, 13 Dec 2017 17:00:14 +0300 Received: by smtp4j.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id wofIVZPvo7-0DW8bI2i; Wed, 13 Dec 2017 17:00:13 +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: Wed, 13 Dec 2017 17:00:11 +0300 Message-Id: <1513173611-3364-3-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1513173611-3364-1-git-send-email-odpbot@yandex.ru> References: <1513173611-3364-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 336 Subject: [lng-odp] [PATCH API-NEXT v5 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: d96a8207591fbcaac25b79286d7d72a537354c1f ** Merge commit sha: 2acab8f3366dfdeb263aea1001fa070b92f81a10 **/ 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 *