diff mbox

[net] ipv6: fix checksum annotation in udp6_csum_init

Message ID 1465671401-6329-1-git-send-email-hannes@stressinduktion.org
State Superseded, archived
Delegated to: David Miller
Headers show

Commit Message

Hannes Frederic Sowa June 11, 2016, 6:56 p.m. UTC
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>
---
 include/net/ip6_checksum.h | 2 +-
 net/ipv6/ip6_checksum.c    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Comments

Hannes Frederic Sowa June 11, 2016, 7:10 p.m. UTC | #1
On Sat, Jun 11, 2016, at 20:56, Hannes Frederic Sowa 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>

Sorry for the noise, I will send a better patch in a minute.
diff mbox

Patch

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;