From patchwork Sat Feb 23 01:17:41 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Darrell Ball X-Patchwork-Id: 1047242 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=openvswitch.org (client-ip=140.211.169.12; helo=mail.linuxfoundation.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="jxzKHol0"; dkim-atps=neutral Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 445r6f2yXCz9sBF for ; Sat, 23 Feb 2019 12:22:34 +1100 (AEDT) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id C5CB753AE; Sat, 23 Feb 2019 01:22:30 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@mail.linuxfoundation.org Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org [172.17.192.35]) by mail.linuxfoundation.org (Postfix) with ESMTPS id 3C6574B08 for ; Sat, 23 Feb 2019 01:17:52 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from mail-pl1-f193.google.com (mail-pl1-f193.google.com [209.85.214.193]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id C404E3D0 for ; Sat, 23 Feb 2019 01:17:51 +0000 (UTC) Received: by mail-pl1-f193.google.com with SMTP id k2so1852768plt.3 for ; Fri, 22 Feb 2019 17:17:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=DD3MU96oFffvEtXXQUDqLdyNw2ZfznFMry3JQALGRoc=; b=jxzKHol0YmhfAHrlkusKTh9GI81hWq4Vzz6A6jvjGmB71Wf3zlyxo9pVCW+KWpNIXE Pdd14eksKq5m39UXcP/tjl7AeNQxjZ1bt886hsFJzzpPJ7ZknfNR0q4SWNhGiM6iZBLx g69h2gfIhIP4YCR1RNIvW2YBMJXZUK7skdXfVU6rMzqcI3l7naB+TAkur8v5bypqoCH3 BNDkRHBLBdB8qCe3evK2N5Lpsh2bh+5y6KFkaNhNYgK+374YmccchiAWXbK3O2umPCY4 YukqJK6f6FHQaKGemxfIDiC+8+KZuQhUvmopWCTY2q5nxCJRhmUxQEDLQOR/nhwIaZ3q hMtw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=DD3MU96oFffvEtXXQUDqLdyNw2ZfznFMry3JQALGRoc=; b=pWDLL9jv7mPohQWpgjLtJqfyTFyxobNq5ql2lzYA1aAqWgHxaoFxAMSV0WVg4QQOAk QA+IJKoWJT4kjcLgRIi4mhEPA70TFpJize9B0RQpGN5Khbr+xlIEp8lU/WiY17ZH1goU M3tew3p8nCHVj3XCgEdMerAkEf81bVu/OTdnww1nrZpYzlP6YvvkPhNHZl0VBYxgj2D2 mmrPWKEGQ4t2/sv/Euc1/Q97+Z9ID+Ypdrts183TvcWokPSICsiwGEN/5e54piQgIGb6 lhg88HEg6JaykVu0L6pcIXfm2Xofir6Va16W7KvKvCgYs4bWFOHbA0S+ERYXb3s8UqDU dHmA== X-Gm-Message-State: AHQUAuZZAKPUemFTEaATf4Ge9yr/g7GH/1Cun3mPN4WK6IQ+2FxEgLYg 316stEWzILAb+5xLqvL+WFc= X-Google-Smtp-Source: AHgI3IYwsnOCwj5Gm1JMUisLYem+7Y4ZBBErlX8KAbNaWPO57d2cPRiqmmgfN8UAtU+AFW1GfB8i9w== X-Received: by 2002:a17:902:70c7:: with SMTP id l7mr4109829plt.54.1550884671319; Fri, 22 Feb 2019 17:17:51 -0800 (PST) Received: from ubuntu.localdomain ([208.91.2.2]) by smtp.gmail.com with ESMTPSA id o76sm6329760pfa.156.2019.02.22.17.17.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 22 Feb 2019 17:17:50 -0800 (PST) From: Darrell Ball To: dlu998@gmail.com, dev@openvswitch.org Date: Fri, 22 Feb 2019 17:17:41 -0800 Message-Id: <1550884662-119149-1-git-send-email-dlu998@gmail.com> X-Mailer: git-send-email 1.9.1 X-Spam-Status: No, score=-1.7 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_ENVFROM_END_DIGIT,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE autolearn=no version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Subject: [ovs-dev] [patch v2 1/2] packets: Change return type for 'packet_csum_upperlayer6()'. X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: ovs-dev-bounces@openvswitch.org Errors-To: ovs-dev-bounces@openvswitch.org Signed-off-by: Darrell Ball --- New patch for series with another patch at v2. Series will need to be backported to 2.6. lib/packets.c | 2 +- lib/packets.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/packets.c b/lib/packets.c index f5a2005..a8fd61f 100644 --- a/lib/packets.c +++ b/lib/packets.c @@ -1695,7 +1695,7 @@ packet_csum_pseudoheader6(const struct ovs_16aligned_ip6_hdr *ip6) /* Calculate the IPv6 upper layer checksum according to RFC2460. We pass the ip6_nxt and ip6_plen values, so it will also work if extension headers are present. */ -uint16_t +ovs_be16 packet_csum_upperlayer6(const struct ovs_16aligned_ip6_hdr *ip6, const void *data, uint8_t l4_protocol, uint16_t l4_size) diff --git a/lib/packets.h b/lib/packets.h index fcd90b3..e20a70a 100644 --- a/lib/packets.h +++ b/lib/packets.h @@ -951,7 +951,7 @@ struct icmp6_error_header { BUILD_ASSERT_DECL(ICMP6_ERROR_HEADER_LEN == sizeof(struct icmp6_error_header)); uint32_t packet_csum_pseudoheader6(const struct ovs_16aligned_ip6_hdr *); -uint16_t packet_csum_upperlayer6(const struct ovs_16aligned_ip6_hdr *, +ovs_be16 packet_csum_upperlayer6(const struct ovs_16aligned_ip6_hdr *, const void *, uint8_t, uint16_t); /* Neighbor Discovery option field.