[NET]: Annotate csum_tcpudp_magic() callers in net/*
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
diff --git a/include/net/tcp.h b/include/net/tcp.h
index 3639608..826aaec 100644
--- a/include/net/tcp.h
+++ b/include/net/tcp.h
@@ -807,9 +807,9 @@
/*
* Calculate(/check) TCP checksum
*/
-static inline u16 tcp_v4_check(struct tcphdr *th, int len,
- unsigned long saddr, unsigned long daddr,
- unsigned long base)
+static inline __sum16 tcp_v4_check(struct tcphdr *th, int len,
+ __be32 saddr, __be32 daddr,
+ __wsum base)
{
return csum_tcpudp_magic(saddr,daddr,len,IPPROTO_TCP,base);
}
diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
index 98ba750..f9c4ed7 100644
--- a/net/ipv4/udp.c
+++ b/net/ipv4/udp.c
@@ -414,8 +414,9 @@
static void udp4_hwcsum_outgoing(struct sock *sk, struct sk_buff *skb,
__be32 src, __be32 dst, int len )
{
- unsigned int csum = 0, offset;
+ unsigned int offset;
struct udphdr *uh = skb->h.uh;
+ __wsum csum = 0;
if (skb_queue_len(&sk->sk_write_queue) == 1) {
/*