diff options
| author | Hannes Frederic Sowa <hannes@stressinduktion.org> | 2016-06-12 12:02:46 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-06-14 21:28:04 +0200 |
| commit | b46d9f625b07f843c706c2c7d0210a90ccdf143b (patch) | |
| tree | 44a968b62edcecd4c3a70d0c2875665585cf7a05 /net/ipv4 | |
| parent | ipv6: fix checksum annotation in udp6_csum_init (diff) | |
| download | linux-b46d9f625b07f843c706c2c7d0210a90ccdf143b.tar.xz linux-b46d9f625b07f843c706c2c7d0210a90ccdf143b.zip | |
ipv4: fix checksum annotation in udp4_csum_init
Reported-by: Cong Wang <xiyou.wangcong@gmail.com>
Cc: Cong Wang <xiyou.wangcong@gmail.com>
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/ipv4')
| -rw-r--r-- | net/ipv4/udp.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c index 0ff31d97d485..ba0d8b8b7690 100644 --- a/net/ipv4/udp.c +++ b/net/ipv4/udp.c @@ -1755,8 +1755,11 @@ static inline int udp4_csum_init(struct sk_buff *skb, struct udphdr *uh, return err; } - return skb_checksum_init_zero_check(skb, proto, uh->check, - inet_compute_pseudo); + /* Note, we are only interested in != 0 or == 0, thus the + * force to int. + */ + return (__force int)skb_checksum_init_zero_check(skb, proto, uh->check, + inet_compute_pseudo); } /* |