From patchwork Mon Nov 13 02:00:16 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: 118706 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp1271719qgn; Sun, 12 Nov 2017 18:10:09 -0800 (PST) X-Google-Smtp-Source: AGs4zMZ39RaYQlD4EyRvKOLz+L9oxFXXoqTHz7syI2/i22IbEEEfUvy6BotYtYkk6rBVGj9/DbTy X-Received: by 10.200.56.75 with SMTP id r11mr11966385qtb.65.1510539009090; Sun, 12 Nov 2017 18:10:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1510539009; cv=none; d=google.com; s=arc-20160816; b=u2eVfI1BUYQbqLwNCqNYkcnKZKaxjZrIBVFKJaWmg7D1ghYF13O09mKTT6jsF5fLdJ lEoafoiN9MAosRxEQQIFD7T/M6pJCJolOgQ4UudWiwI1NyNBnfI1c/uee6zRavY/h8aM Va1vIMa22wh/8hAFDRIF5lvMpaeXQz89UAJnTbPF9GTNSYsad72lpa5fJel+xtpJcnEA RMQATMHOMGY09qSXcNe78mqpjhLhMvfh1YfB7ZOKk7GbBXcB2Xly5x5j8Kg15JXVuGHE IzvPwq1vXfyJG0Da9jOv8f+SyFUJ2Rmqjlv3HDE9PTJgNgRlV/UF35XRHHGTU5pEqvwL XKzw== 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=c9QC44CVoCeGDNsFN8ZdxYNsRuMIQvZKd/XNOZ0EDGE=; b=HQGVCMUKqK6CG4saGlCybrC45XaAk+fdtMtBQ6cP3EWRDw/Fnz2rqSk4KcMFt0KH4x qtEsxcYAMdihhykT5tYseFGZo3SBlPBgZtWy22Eq+7ODWBTrYDEpyjyjOWG+ljDB5cOW AKHZfN5Rj3qqOmomJ3i+Ump9QNf4DgWb0WAw+64n4JinY8Wf0Ta3RMTPPVPi22hFE2Zd YCSrqYCi3SVGI/b2XArU2eusN47jF7YSpUp0Ltj1h1iyTVEP/Is9WUkRwXybD1CBpVgs 0R+YOll2Zf0CemlPnsCSaoOjCoZdAVl3+XHI9pefY2S0Tbl/5BqeGtw74aO2zUd6iaAP 317w== 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 k6si7258010qkl.50.2017.11.12.18.10.08; Sun, 12 Nov 2017 18:10:09 -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 C89F460D6F; Mon, 13 Nov 2017 02:10:08 +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=-5.4 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2, 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 9758A60FFE; Mon, 13 Nov 2017 02:02:42 +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 1E5F460D70; Mon, 13 Nov 2017 02:02:29 +0000 (UTC) Received: from forward101p.mail.yandex.net (forward101p.mail.yandex.net [77.88.28.101]) by lists.linaro.org (Postfix) with ESMTPS id 6A96C60C36 for ; Mon, 13 Nov 2017 02:00:28 +0000 (UTC) Received: from mxback16j.mail.yandex.net (mxback16j.mail.yandex.net [IPv6:2a02:6b8:0:1619::92]) by forward101p.mail.yandex.net (Yandex) with ESMTP id BF8006A8D7BA for ; Mon, 13 Nov 2017 05:00:26 +0300 (MSK) Received: from smtp3o.mail.yandex.net (smtp3o.mail.yandex.net [2a02:6b8:0:1a2d::27]) by mxback16j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id A24mbtSVxU-0QiaHxND; Mon, 13 Nov 2017 05:00:26 +0300 Received: by smtp3o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id uZeq9OjDfk-0QvicoTT; Mon, 13 Nov 2017 05: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: Mon, 13 Nov 2017 05:00:16 +0300 Message-Id: <1510538419-566-12-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1510538419-566-1-git-send-email-odpbot@yandex.ru> References: <1510538419-566-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 243 Subject: [lng-odp] [PATCH API-NEXT v15 11/14] linux-gen: ipsec: correct frag_offset for tunneled packets 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 Generated outer header should have frag_offset = 0, MF = 0. Change code accordingly. Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 243 (lumag:ipsec-packet-impl-3) ** https://github.com/Linaro/odp/pull/243 ** Patch: https://github.com/Linaro/odp/pull/243.patch ** Base sha: a908a4dead95321e84d6a8a23de060051dcd8969 ** Merge commit sha: 44a6636daa5f976c8aac76116e80e0c764352072 **/ platform/linux-generic/odp_ipsec.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/platform/linux-generic/odp_ipsec.c b/platform/linux-generic/odp_ipsec.c index 400ef2958..ca02549ea 100644 --- a/platform/linux-generic/odp_ipsec.c +++ b/platform/linux-generic/odp_ipsec.c @@ -663,10 +663,10 @@ static ipsec_sa_t *ipsec_out_single(odp_packet_t pkt, out_ip.id = odp_atomic_fetch_add_u32(&ipsec_sa->out.tun_hdr_id, 1); if (ipsec_sa->copy_df) - out_ip.frag_offset = ip->frag_offset; + out_ip.frag_offset = ip->frag_offset & 0x4000; else - out_ip.frag_offset = (ip->frag_offset & ~0x4000) | - (ipsec_sa->out.tun_df << 14); + out_ip.frag_offset = + ((uint16_t)ipsec_sa->out.tun_df) << 14; out_ip.ttl = ipsec_sa->out.tun_ttl; out_ip.proto = _ODP_IPV4; /* Will be filled later by packet checksum update */