| Message ID | 1465672537-26131-1-git-send-email-hannes@stressinduktion.org |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
On Sat, Jun 11, 2016 at 12:15 PM, Hannes Frederic Sowa <hannes@stressinduktion.org> wrote: > 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> > --- > net/ipv6/ip6_checksum.c | 7 +++++-- > 1 file changed, 5 insertions(+), 2 deletions(-) > > diff --git a/net/ipv6/ip6_checksum.c b/net/ipv6/ip6_checksum.c > index b2025bf3da4af2..c0cbcb259f5a9a 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); Same for udp4_csum_init() ?
From: Hannes Frederic Sowa <hannes@stressinduktion.org> Date: Sat, 11 Jun 2016 21:15:37 +0200 > 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> Applied.
diff --git a/net/ipv6/ip6_checksum.c b/net/ipv6/ip6_checksum.c index b2025bf3da4af2..c0cbcb259f5a9a 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);
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> --- net/ipv6/ip6_checksum.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)