From patchwork Tue Jan 23 15:00:20 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 125531 Delivered-To: patch@linaro.org Received: by 10.46.66.141 with SMTP id h13csp1808882ljf; Tue, 23 Jan 2018 07:04:18 -0800 (PST) X-Google-Smtp-Source: AH8x227LGetk+x7Qqz7FUDkfxq4wq3lz2voMrj/Gz/YDMp+6fuf8oyA5/wFfLaZcLHobBv9HWASv X-Received: by 10.200.44.251 with SMTP id 56mr4223818qtx.55.1516719858182; Tue, 23 Jan 2018 07:04:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516719858; cv=none; d=google.com; s=arc-20160816; b=sqeOc7xr+oljpi7h0m0ZDRcpB2ZCyZk/nHa0vyrzkbkHKELBlsgwzl+eUhrOmoI69i K9ulv0JRQwR5W3UW8eFk5D7Oc4yOgcLGiZbHRqxvBXsrPT05KTdKH8hKM5HvzshlNQws 159zfauYslrPcyu2RAnl4do1llWZaErE7XV12/jQow7OekyN4Z0+eHNy5zR75XbazQ1v 6p5Eh64Qq3nhn1v6xECO03SBdv/jH6nmoC3JQR6QMjUv0gbK/xRHmd1jJqjkKPnPgyz/ q2n1IPf21kAn7LbMAA1ekXIxDpm354iI5yZdH5JqIKe/a2pL7whX0Fox+u57lfoAg7Oa wV4g== 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=p+rHsH1AICGFytEcvL6pijS3vwxnBtWRQuw0uOJgs4g=; b=zzPylsDdX3OWWoxQzRXaXCDvX9cw64MAdOMeCRxI+6s3e9EJPV7fnFGSf6SZhjkdN+ zoeJim4Cw6fNF8d4CT1pnt4ToOlLItQ1/u/Vbh/gpCRwksfNEN9j002fjCpMty5MY3W3 5fzJP24MFEh4JLlNLANBSI/V2O+7JEbNR2gK3jG2weIcgwXisKpTviSjBKu5Hn+3q2a/ SUoGZyzlUtHCdpn1CNt3OxLJrpsmgQAqeq371yLQaH8saxDYGG9uJb62CkYDFInF+BOL nit5WbhlaKs0pWf37ScPOJgkA5sqtFdziuQrjoNYrJHtPlRizg/nV4LJ7UynN5dIgmvb 1mgw== 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 l1si689132qkd.70.2018.01.23.07.04.17; Tue, 23 Jan 2018 07:04:18 -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 C5654617D0; Tue, 23 Jan 2018 15:04:17 +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_H2 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 F29CE6179A; Tue, 23 Jan 2018 15:02:21 +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 C1625617D2; Tue, 23 Jan 2018 15:02:09 +0000 (UTC) Received: from forward104j.mail.yandex.net (forward104j.mail.yandex.net [5.45.198.247]) by lists.linaro.org (Postfix) with ESMTPS id 0630C617B3 for ; Tue, 23 Jan 2018 15:00:28 +0000 (UTC) Received: from mxback2g.mail.yandex.net (mxback2g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:163]) by forward104j.mail.yandex.net (Yandex) with ESMTP id A273C4363B for ; Tue, 23 Jan 2018 18:00:26 +0300 (MSK) Received: from smtp3p.mail.yandex.net (smtp3p.mail.yandex.net [2a02:6b8:0:1472:2741:0:8b6:8]) by mxback2g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id 7Ar60ZYmbD-0QNurlGF; Tue, 23 Jan 2018 18:00:26 +0300 Received: by smtp3p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id IwkpSe7BuA-0QdGOAMN; Tue, 23 Jan 2018 18:00:26 +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, 23 Jan 2018 18:00:20 +0300 Message-Id: <1516719624-9914-3-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1516719624-9914-1-git-send-email-odpbot@yandex.ru> References: <1516719624-9914-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 403 Subject: [lng-odp] [PATCH API-NEXT v2 2/6] api: ipsec: rename fragmentation mode option 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: Petri Savolainen Rename outbound operation fragmentation options to frag_mode. Frag_mode is used elsewhere in the API and "mode" is too generic term for it (not future proof). Signed-off-by: Petri Savolainen --- /** Email created from pull request 403 (psavol:next-ipsec-tfc) ** https://github.com/Linaro/odp/pull/403 ** Patch: https://github.com/Linaro/odp/pull/403.patch ** Base sha: 44974a09b01c79adb9637a5dff38539598a76737 ** Merge commit sha: 537da7cd2083945c4673ac0dd7b29beb6825bce7 **/ include/odp/api/spec/ipsec.h | 2 +- platform/linux-generic/odp_ipsec.c | 2 +- test/validation/api/ipsec/ipsec_test_out.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/odp/api/spec/ipsec.h b/include/odp/api/spec/ipsec.h index c78afbe3f..1060a3ee2 100644 --- a/include/odp/api/spec/ipsec.h +++ b/include/odp/api/spec/ipsec.h @@ -984,7 +984,7 @@ typedef struct odp_ipsec_op_flag_t { */ typedef struct odp_ipsec_out_opt_t { /** Fragmentation mode */ - odp_ipsec_frag_mode_t mode; + odp_ipsec_frag_mode_t frag_mode; } odp_ipsec_out_opt_t; diff --git a/platform/linux-generic/odp_ipsec.c b/platform/linux-generic/odp_ipsec.c index b6192377e..9f08b228c 100644 --- a/platform/linux-generic/odp_ipsec.c +++ b/platform/linux-generic/odp_ipsec.c @@ -1306,7 +1306,7 @@ static ipsec_sa_t *ipsec_out_single(odp_packet_t pkt, ipsec_sa = _odp_ipsec_sa_use(sa); ODP_ASSERT(NULL != ipsec_sa); - if ((opt && opt->mode == ODP_IPSEC_FRAG_CHECK) || + if ((opt && opt->frag_mode == ODP_IPSEC_FRAG_CHECK) || (!opt && ipsec_sa->out.frag_mode == ODP_IPSEC_FRAG_CHECK)) mtu = ipsec_sa->out.mtu; else diff --git a/test/validation/api/ipsec/ipsec_test_out.c b/test/validation/api/ipsec/ipsec_test_out.c index 971fbbf8d..4940efa5a 100644 --- a/test/validation/api/ipsec/ipsec_test_out.c +++ b/test/validation/api/ipsec/ipsec_test_out.c @@ -530,7 +530,7 @@ static void test_out_ipv4_ah_sha256_frag_check(void) ipsec_test_part test2 = { .pkt_in = &pkt_ipv4_icmp_0, .num_opt = 1, - .opt = { .mode = ODP_IPSEC_FRAG_DISABLED, }, + .opt = { .frag_mode = ODP_IPSEC_FRAG_DISABLED, }, .out_pkt = 1, .out = { { .status.warn.all = 0, @@ -623,7 +623,7 @@ static void test_out_ipv4_esp_null_sha256_frag_check(void) ipsec_test_part test2 = { .pkt_in = &pkt_ipv4_icmp_0, .num_opt = 1, - .opt = { .mode = ODP_IPSEC_FRAG_DISABLED, }, + .opt = { .frag_mode = ODP_IPSEC_FRAG_DISABLED, }, .out_pkt = 1, .out = { { .status.warn.all = 0,