From patchwork Thu Jan 18 14:00:10 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: 124963 Delivered-To: patch@linaro.org Received: by 10.46.64.27 with SMTP id n27csp139248lja; Thu, 18 Jan 2018 06:04:29 -0800 (PST) X-Google-Smtp-Source: ACJfBos8aNYuqAI/2LRDn2E/kgblZNQA7e2usfRL1aFS1zBbuIZmO8wV+wsNgBJFrS4EwMVo8B5A X-Received: by 10.237.47.131 with SMTP id m3mr20733816qtd.201.1516284269256; Thu, 18 Jan 2018 06:04:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516284269; cv=none; d=google.com; s=arc-20160816; b=CQ8IkAQkmk1hCFrAvMhCsyLvPLU0dbUjDdb7uAJwyx3/+0PEsGqWw8caT6qTAN/GjT Sgv1nH+KvjGA9oYuv8uUoFhvuuQHEHCSErY+hkMNeBzgfgjHu2BT4f2QU1AhXI/HiWEY lTULXKSGPSctQRGgwc6oGc7fIUPN8dAedVjtN7N3zi+31Amp7xZsgpq0BGwqJJcPU34V hLwTKr/OHCcf5IV5peNu6DKNK03hJubWzsCigU3atpcuRKEZu/Vc8uKiPNwkS5S/Dtsh wHSxvZsOF7DMahKKKnrtuuFpzbf0dennqN+g1u71SPgkzN6vjQGRDvN7hm2faIUQZVs1 8PFg== 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=F7ANnbDA4AGabgwAGyKoATeZH7jUi+3fsuvdJjX8o6E=; b=n1BqqMOlEk31huj0Wr2fWaxK1yW2jwdh9kJRzdeei1g0bQY6DWrwAq2F7iDmyrY0sv vh28rpcaNs0qa002UL4DZbN7iviJsIgsxinlVZVuGR54+UrLKdtgP2J3BCzNnYvm+iav yXPtF7UOZuGk0uFqJ+9d8tzksx5I37ZWfJM9kBoQgWJncZSVlCjUs2Brnp+PIxLe6J0j XXW/CpW3cGLzo/G1fGnHkA+ZvSNBnns+SrRpOGoscTC7nLFPudSKIlYIj1BWophT+EnZ peMPFs7QRvFecGUDwabBWwsdxYSTuXEiG7E9Oy1z96do18P38AtdsWQinZnIz3pj7LyQ 6xBA== 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 q63si7636572qkl.36.2018.01.18.06.04.28; Thu, 18 Jan 2018 06:04:29 -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 DA6BB62842; Thu, 18 Jan 2018 14:04:28 +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 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 272C8627FF; Thu, 18 Jan 2018 14:02:05 +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 8CAA8627A7; Thu, 18 Jan 2018 14:01:47 +0000 (UTC) Received: from forward106o.mail.yandex.net (forward106o.mail.yandex.net [37.140.190.187]) by lists.linaro.org (Postfix) with ESMTPS id DEFE162787 for ; Thu, 18 Jan 2018 14:00:37 +0000 (UTC) Received: from mxback3o.mail.yandex.net (mxback3o.mail.yandex.net [IPv6:2a02:6b8:0:1a2d::1d]) by forward106o.mail.yandex.net (Yandex) with ESMTP id 134AF78176E for ; Thu, 18 Jan 2018 17:00:36 +0300 (MSK) Received: from smtp2p.mail.yandex.net (smtp2p.mail.yandex.net [2a02:6b8:0:1472:2741:0:8b6:7]) by mxback3o.mail.yandex.net (nwsmtp/Yandex) with ESMTP id Hjsjc0FxNh-0ZUKciou; Thu, 18 Jan 2018 17:00:36 +0300 Received: by smtp2p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id dH7Jf5U1Ot-0TqqEOYq; Thu, 18 Jan 2018 17:00:29 +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, 18 Jan 2018 17:00:10 +0300 Message-Id: <1516284012-2640-3-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1516284012-2640-1-git-send-email-odpbot@yandex.ru> References: <1516284012-2640-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 403 Subject: [lng-odp] [PATCH API-NEXT v1 2/4] 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: 0c7741d067d9b96e14e420b53a256a1b93096e16 ** Merge commit sha: 14f0b7020e142ed747602a2856214c93e06ff84e **/ 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 f97e071a6..471df6192 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 e19907a5f..29e75fdd4 100644 --- a/platform/linux-generic/odp_ipsec.c +++ b/platform/linux-generic/odp_ipsec.c @@ -1304,7 +1304,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 4751e6ec8..7dc7d2bc3 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,