OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5119bd1
)
ipv6: fix checksum annotation in udp6_csum_init
author
Hannes Frederic Sowa
<hannes@stressinduktion.org>
Sat, 11 Jun 2016 19:15:37 +0000
(21:15 +0200)
committer
David S. Miller
<davem@davemloft.net>
Tue, 14 Jun 2016 19:26:42 +0000
(15:26 -0400)
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>
net/ipv6/ip6_checksum.c
patch
|
blob
|
history
diff --git
a/net/ipv6/ip6_checksum.c
b/net/ipv6/ip6_checksum.c
index
b2025bf
..
c0cbcb2
100644
(file)
--- 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);