From patchwork Thu Jan 25 15:00:14 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: 125864 Delivered-To: patch@linaro.org Received: by 10.46.66.141 with SMTP id h13csp1173696ljf; Thu, 25 Jan 2018 07:06:14 -0800 (PST) X-Google-Smtp-Source: AH8x224zHPXL2jpIpgNHy8W7BYMt8+Lo8cgctd3sk9PpGSCZf4X6ZvH8GX67HjFqt02HiUEXLO5Q X-Received: by 10.55.10.7 with SMTP id 7mr14840155qkk.353.1516892774015; Thu, 25 Jan 2018 07:06:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516892774; cv=none; d=google.com; s=arc-20160816; b=UOI1gYYkyJZYkAwFNztgEVBJSnirlVMVdoAuMd/rvZMV5FJkgLtmq3AHJ6g0sQPKRG 0jjB11OG9VK+ibVPtGpK61bg5GDD1pTYL4STI9ZTwBO3xTnFMnBvKohfbVZuDzmv6Utl XGl1Nta3sgxZYquPKMf3y7KcMmmZKeRLioZaifeqG6HBE64DBuWOENm8huAZrrXtfW1R B0DvLGt7M/2h+zRu+6sQJAxCqvJFmfv4O4xk+WDXuDvgROAv2Cz8jaZumzbfowMzxsum tdbKxWOP7cLE0QTO/UThKPPqqu7EAiTsHA5R9LIz2Ti0S6uKnzg8HNuaXlR+LoZ8aZg5 kwrg== 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=KlSUP3HC2/71mti3LEiJnSApXZv162GwAH75RG79KF8=; b=Hio3UQeVzLVzeFI4/he2BBrNkvub723yJzjmw3Ys6fmoOTaus1uMl7+0hTw4QxWW6a 0U0CFifiSytxRjcFvY3cQFh2PezWQxjHY8Ql+KFuW/YB3plSwmL6kd6Rsisy/9cbegLZ 2wvdwCcgEO6uHezJalbXCMQvinPI9D6zGvjrmdAKJ7rg9GCsOMunLLZ3kLBvTtAhsew4 YcL/4o2cYS2Ejh188eY8P798qIppYv9VGdlmdrPlqs6L6YKQc0YdjMEc+loIytZ6fVd6 WixplhjJBXqplaQTljvQiVG9cxx5JerM2Zw1UJdAk9BCKiJbOT//quLbAra1Y8+dAB/a O1+g== 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 l21si5543353qtf.316.2018.01.25.07.06.13; Thu, 25 Jan 2018 07:06:13 -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 9FA9361774; Thu, 25 Jan 2018 15:06: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_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 F1D6761787; Thu, 25 Jan 2018 15:03: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 DE92461774; Thu, 25 Jan 2018 15:03:51 +0000 (UTC) Received: from forward101o.mail.yandex.net (forward101o.mail.yandex.net [37.140.190.181]) by lists.linaro.org (Postfix) with ESMTPS id 0EB1B61796 for ; Thu, 25 Jan 2018 15:01:47 +0000 (UTC) Received: from mxback8j.mail.yandex.net (mxback8j.mail.yandex.net [IPv6:2a02:6b8:0:1619::111]) by forward101o.mail.yandex.net (Yandex) with ESMTP id E09CD1341829 for ; Thu, 25 Jan 2018 18:00:20 +0300 (MSK) Received: from smtp1j.mail.yandex.net (smtp1j.mail.yandex.net [2a02:6b8:0:801::ab]) by mxback8j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id ZT0xRLw9pg-0K7eOQZI; Thu, 25 Jan 2018 18:00:20 +0300 Received: by smtp1j.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id tNrAE6Xzdv-0KDqiltf; Thu, 25 Jan 2018 18: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: Thu, 25 Jan 2018 18:00:14 +0300 Message-Id: <1516892418-5660-3-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1516892418-5660-1-git-send-email-odpbot@yandex.ru> References: <1516892418-5660-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 403 Subject: [lng-odp] [PATCH API-NEXT v3 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: acecf073764f87bfadb64c598703458d344b39f4 **/ 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,