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

[NET]: Annotate ip_vs_checksum_complete() and callers.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h
index 903108e583..fedea8db15 100644
--- a/include/net/ip_vs.h
+++ b/include/net/ip_vs.h
@@ -988,7 +988,7 @@ extern int ip_vs_make_skb_writable(struct sk_buff **pskb, int len);
 extern void ip_vs_nat_icmp(struct sk_buff *skb, struct ip_vs_protocol *pp,
 		struct ip_vs_conn *cp, int dir);
 
-extern u16 ip_vs_checksum_complete(struct sk_buff *skb, int offset);
+extern __sum16 ip_vs_checksum_complete(struct sk_buff *skb, int offset);
 
 static inline u16 ip_vs_check_diff(u32 old, u32 new, u16 oldsum)
 {
diff --git a/net/ipv4/ipvs/ip_vs_core.c b/net/ipv4/ipvs/ip_vs_core.c
index fac2dffd66..34257520a3 100644
--- a/net/ipv4/ipvs/ip_vs_core.c
+++ b/net/ipv4/ipvs/ip_vs_core.c
@@ -536,7 +536,7 @@ static unsigned int ip_vs_post_routing(unsigned int hooknum,
 	return NF_STOP;
 }
 
-u16 ip_vs_checksum_complete(struct sk_buff *skb, int offset)
+__sum16 ip_vs_checksum_complete(struct sk_buff *skb, int offset)
 {
 	return csum_fold(skb_checksum(skb, offset, skb->len - offset, 0));
 }