aboutsummaryrefslogtreecommitdiffstats
path: root/include/net
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2006-11-15 00:40:42 -0500
committerDavid S. Miller <davem@sunset.davemloft.net>2006-12-03 00:23:38 -0500
commitb51655b958dfb1176bfcf99466231fdbef8751ff (patch)
treea53d0ec00d8db4169ba8c1c487fffbd34d6dde03 /include/net
parentb1550f221255f7dd06048d832bf0f3d166840e1c (diff)
[NET]: Annotate __skb_checksum_complete() and friends.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net')
-rw-r--r--include/net/tcp.h2
-rw-r--r--include/net/udp.h8
2 files changed, 5 insertions, 5 deletions
diff --git a/include/net/tcp.h b/include/net/tcp.h
index 826aaecdb994..aa7989c53791 100644
--- a/include/net/tcp.h
+++ b/include/net/tcp.h
@@ -814,7 +814,7 @@ static inline __sum16 tcp_v4_check(struct tcphdr *th, int len,
814 return csum_tcpudp_magic(saddr,daddr,len,IPPROTO_TCP,base); 814 return csum_tcpudp_magic(saddr,daddr,len,IPPROTO_TCP,base);
815} 815}
816 816
817static inline int __tcp_checksum_complete(struct sk_buff *skb) 817static inline __sum16 __tcp_checksum_complete(struct sk_buff *skb)
818{ 818{
819 return __skb_checksum_complete(skb); 819 return __skb_checksum_complete(skb);
820} 820}
diff --git a/include/net/udp.h b/include/net/udp.h
index 39e825a6909a..c5ccd9a3387b 100644
--- a/include/net/udp.h
+++ b/include/net/udp.h
@@ -69,15 +69,15 @@ struct sk_buff;
69/* 69/*
70 * Generic checksumming routines for UDP(-Lite) v4 and v6 70 * Generic checksumming routines for UDP(-Lite) v4 and v6
71 */ 71 */
72static inline u16 __udp_lib_checksum_complete(struct sk_buff *skb) 72static inline __sum16 __udp_lib_checksum_complete(struct sk_buff *skb)
73{ 73{
74 if (! UDP_SKB_CB(skb)->partial_cov) 74 if (! UDP_SKB_CB(skb)->partial_cov)
75 return __skb_checksum_complete(skb); 75 return __skb_checksum_complete(skb);
76 return csum_fold(skb_checksum(skb, 0, UDP_SKB_CB(skb)->cscov, 76 return csum_fold(skb_checksum(skb, 0, UDP_SKB_CB(skb)->cscov,
77 skb->csum)); 77 skb->csum));
78} 78}
79 79
80static __inline__ int udp_lib_checksum_complete(struct sk_buff *skb) 80static inline __sum16 udp_lib_checksum_complete(struct sk_buff *skb)
81{ 81{
82 return skb->ip_summed != CHECKSUM_UNNECESSARY && 82 return skb->ip_summed != CHECKSUM_UNNECESSARY &&
83 __udp_lib_checksum_complete(skb); 83 __udp_lib_checksum_complete(skb);