From patchwork Sat Jun 11 18:56:41 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hannes Frederic Sowa X-Patchwork-Id: 634099 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3rRpF55N7Cz9sdm for ; Sun, 12 Jun 2016 04:57:13 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=stressinduktion.org header.i=@stressinduktion.org header.b=ChB70TNe; dkim=pass (1024-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.b=gE2PwnbA; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752061AbcFKS5K (ORCPT ); Sat, 11 Jun 2016 14:57:10 -0400 Received: from out2-smtp.messagingengine.com ([66.111.4.26]:43393 "EHLO out2-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751883AbcFKS5I (ORCPT ); Sat, 11 Jun 2016 14:57:08 -0400 Received: from compute7.internal (compute7.nyi.internal [10.202.2.47]) by mailout.nyi.internal (Postfix) with ESMTP id AA61720767; Sat, 11 Jun 2016 14:57:07 -0400 (EDT) Received: from frontend2 ([10.202.2.161]) by compute7.internal (MEProxy); Sat, 11 Jun 2016 14:57:07 -0400 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d= stressinduktion.org; h=cc:date:from:message-id:subject:to :x-sasl-enc:x-sasl-enc; s=mesmtp; bh=Ruu4m2iHMtV9X/eF/2AgMu55bE8 =; b=ChB70TNeRK4BrS+o5f4Ci5zpH2sxYUAt/9XmZngJmD5JYV+XnIGSL/Zz57C q1PXhBtYFAPqAEOremINaAL1ogMHWXCV2ySTTBokBjwwdmryp2rnlx+rpF4IagKz VKbGw2GpZOR1ZvuH+obxBFbSxWikJCephGRFSXl21N5QAjWs= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d= messagingengine.com; h=cc:date:from:message-id:subject:to :x-sasl-enc:x-sasl-enc; s=smtpout; bh=Ruu4m2iHMtV9X/eF/2AgMu55bE 8=; b=gE2PwnbAdqaHLr+hxEJF/ahQ2SoyWLYRBTQlbfGEV+3QdJM1wR5B0HoTJP pyfmDXuhpg0cPFW4kUkctizNwIWvHt6g8sU1l+jjON+Rdn50fvE7E5LdhL9U4id3 Phxc6++MD1mcomEo23/FaOiQ6fJ7RfCpGQzCy1izz2tAuH9j0= X-Sasl-enc: i4U0DCjF7mRc/oQoY32lYHgGHTuv88fVntsd5/EW5bl6 1465671422 Received: from z.localhost.localdomain (unknown [213.55.184.214]) by mail.messagingengine.com (Postfix) with ESMTPA id A582CCCD88; Sat, 11 Jun 2016 14:56:53 -0400 (EDT) From: Hannes Frederic Sowa To: netdev@vger.kernel.org Cc: Tom Herbert Subject: [PATCH net] ipv6: fix checksum annotation in udp6_csum_init Date: Sat, 11 Jun 2016 20:56:41 +0200 Message-Id: <1465671401-6329-1-git-send-email-hannes@stressinduktion.org> X-Mailer: git-send-email 2.5.5 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Cc: Tom Herbert Fixes: 4068579e1e098fa ("net: Implmement RFC 6936 (zero RX csums for UDP/IPv6") Signed-off-by: Hannes Frederic Sowa --- include/net/ip6_checksum.h | 2 +- net/ipv6/ip6_checksum.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/net/ip6_checksum.h b/include/net/ip6_checksum.h index cca840584c8885..8ee93d1fc56a5b 100644 --- a/include/net/ip6_checksum.h +++ b/include/net/ip6_checksum.h @@ -101,5 +101,5 @@ void udp6_set_csum(bool nocheck, struct sk_buff *skb, const struct in6_addr *saddr, const struct in6_addr *daddr, int len); -int udp6_csum_init(struct sk_buff *skb, struct udphdr *uh, int proto); +__sum16 udp6_csum_init(struct sk_buff *skb, struct udphdr *uh, int proto); #endif diff --git a/net/ipv6/ip6_checksum.c b/net/ipv6/ip6_checksum.c index b2025bf3da4af2..9282326e4a0a56 100644 --- a/net/ipv6/ip6_checksum.c +++ b/net/ipv6/ip6_checksum.c @@ -61,7 +61,7 @@ __sum16 csum_ipv6_magic(const struct in6_addr *saddr, EXPORT_SYMBOL(csum_ipv6_magic); #endif -int udp6_csum_init(struct sk_buff *skb, struct udphdr *uh, int proto) +__sum16 udp6_csum_init(struct sk_buff *skb, struct udphdr *uh, int proto) { int err;