summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorHannes Frederic Sowa <hannes@stressinduktion.org>2016-06-11 21:15:37 +0200
committerDavid S. Miller <davem@davemloft.net>2016-06-14 15:26:42 -0400
commitc148d16369ff0095eca950d17968ba1d56a47b53 (patch)
tree637615cf5dc1243db33ae4c8b6ea96daf68b2857 /net
parent5119bd16815d3f0364390a1369392dcc036790e7 (diff)
downloadlinux-c148d16369ff0095eca950d17968ba1d56a47b53.tar.gz
linux-c148d16369ff0095eca950d17968ba1d56a47b53.tar.bz2
linux-c148d16369ff0095eca950d17968ba1d56a47b53.zip
ipv6: fix checksum annotation in udp6_csum_init
Cc: Tom Herbert <tom@herbertland.com> Fixes: 4068579e1e098fa ("net: Implmement RFC 6936 (zero RX csums for UDP/IPv6") Signed-off-by: Hannes Frederic Sowa <hannes@stressinduktion.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/ipv6/ip6_checksum.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/net/ipv6/ip6_checksum.c b/net/ipv6/ip6_checksum.c
index b2025bf3da4a..c0cbcb259f5a 100644
--- a/net/ipv6/ip6_checksum.c
+++ b/net/ipv6/ip6_checksum.c
@@ -78,9 +78,12 @@ int udp6_csum_init(struct sk_buff *skb, struct udphdr *uh, int proto)
* we accept a checksum of zero here. When we find the socket
* for the UDP packet we'll check if that socket allows zero checksum
* for IPv6 (set by socket option).
+ *
+ * Note, we are only interested in != 0 or == 0, thus the
+ * force to int.
*/
- return skb_checksum_init_zero_check(skb, proto, uh->check,
- ip6_compute_pseudo);
+ return (__force int)skb_checksum_init_zero_check(skb, proto, uh->check,
+ ip6_compute_pseudo);
}
EXPORT_SYMBOL(udp6_csum_init);