From: Al Viro <viro@zeniv.linux.org.uk>
Date: Wed, 15 Nov 2006 05:28:51 +0000 (-0800)
Subject: [NET]: Annotate csum_tcpudp_magic() callers in net/*
X-Git-Tag: v2.6.20-rc1~34^2~40^2~317
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2bda2853150e20ca2a44627d00b5f85af0b24a42;p=linux-2.6

[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/net/dccp/ipv4.c b/net/dccp/ipv4.c
index 35985334da..6bca71929d 100644
--- a/net/dccp/ipv4.c
+++ b/net/dccp/ipv4.c
@@ -344,7 +344,7 @@ out:
 	sock_put(sk);
 }
 
-static inline u16 dccp_v4_csum_finish(struct sk_buff *skb,
+static inline __sum16 dccp_v4_csum_finish(struct sk_buff *skb,
 				      __be32 src, __be32 dst)
 {
 	return csum_tcpudp_magic(src, dst, skb->len, IPPROTO_DCCP, skb->csum);