aboutsummaryrefslogtreecommitdiffstats
path: root/include/net
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2006-11-20 21:06:37 -0500
committerDavid S. Miller <davem@sunset.davemloft.net>2006-12-03 00:27:16 -0500
commit8e5200f54062b8af0ed1d186ea0f113854786d89 (patch)
tree71e00b21ae4f8410413f70141aa275529dbbfb84 /include/net
parent34bcca28335977e969338c98c6c43a1e08f592b2 (diff)
[NET]: Fix assorted misannotations (from md5 and udplite merges).
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.h2
-rw-r--r--include/net/udplite.h4
3 files changed, 4 insertions, 4 deletions
diff --git a/include/net/tcp.h b/include/net/tcp.h
index aa7989c53791..c99774f15eba 100644
--- a/include/net/tcp.h
+++ b/include/net/tcp.h
@@ -1154,7 +1154,7 @@ extern int tcp_v4_md5_do_add(struct sock *sk,
1154 u8 newkeylen); 1154 u8 newkeylen);
1155 1155
1156extern int tcp_v4_md5_do_del(struct sock *sk, 1156extern int tcp_v4_md5_do_del(struct sock *sk,
1157 u32 addr); 1157 __be32 addr);
1158 1158
1159extern struct tcp_md5sig_pool **tcp_alloc_md5sig_pool(void); 1159extern struct tcp_md5sig_pool **tcp_alloc_md5sig_pool(void);
1160extern void tcp_free_md5sig_pool(void); 1160extern void tcp_free_md5sig_pool(void);
diff --git a/include/net/udp.h b/include/net/udp.h
index c5ccd9a3387b..eac69ff0582c 100644
--- a/include/net/udp.h
+++ b/include/net/udp.h
@@ -77,7 +77,7 @@ static inline __sum16 __udp_lib_checksum_complete(struct sk_buff *skb)
77 skb->csum)); 77 skb->csum));
78} 78}
79 79
80static inline __sum16 udp_lib_checksum_complete(struct sk_buff *skb) 80static inline int 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);
diff --git a/include/net/udplite.h b/include/net/udplite.h
index 3abaab7b78c6..67ac51424307 100644
--- a/include/net/udplite.h
+++ b/include/net/udplite.h
@@ -90,9 +90,9 @@ static __inline__ int udplite6_csum_init(struct sk_buff *skb, struct udphdr *uh)
90 int rc = udplite_checksum_init(skb, uh); 90 int rc = udplite_checksum_init(skb, uh);
91 91
92 if (!rc) 92 if (!rc)
93 skb->csum = ~csum_ipv6_magic(&skb->nh.ipv6h->saddr, 93 skb->csum = ~csum_unfold(csum_ipv6_magic(&skb->nh.ipv6h->saddr,
94 &skb->nh.ipv6h->daddr, 94 &skb->nh.ipv6h->daddr,
95 skb->len, IPPROTO_UDPLITE, 0); 95 skb->len, IPPROTO_UDPLITE, 0));
96 return rc; 96 return rc;
97} 97}
98 98