aboutsummaryrefslogtreecommitdiffstats
path: root/include/net
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2006-11-15 00:35:48 -0500
committerDavid S. Miller <davem@sunset.davemloft.net>2006-12-03 00:23:31 -0500
commit868c86bcb5bdea7ed8d45979b17bb919af9254db (patch)
treeebc232092d6a8a75261a9e3f698206cc09740fdf /include/net
parent2bda2853150e20ca2a44627d00b5f85af0b24a42 (diff)
[NET]: annotate csum_ipv6_magic() callers in net/*
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/udp.h4
-rw-r--r--include/net/udplite.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/include/net/udp.h b/include/net/udp.h
index 4f0626735ed..39e825a6909 100644
--- a/include/net/udp.h
+++ b/include/net/udp.h
@@ -89,9 +89,9 @@ static __inline__ int udp_lib_checksum_complete(struct sk_buff *skb)
89 * @skb: sk_buff containing the filled-in UDP header 89 * @skb: sk_buff containing the filled-in UDP header
90 * (checksum field must be zeroed out) 90 * (checksum field must be zeroed out)
91 */ 91 */
92static inline u32 udp_csum_outgoing(struct sock *sk, struct sk_buff *skb) 92static inline __wsum udp_csum_outgoing(struct sock *sk, struct sk_buff *skb)
93{ 93{
94 u32 csum = csum_partial(skb->h.raw, sizeof(struct udphdr), 0); 94 __wsum csum = csum_partial(skb->h.raw, sizeof(struct udphdr), 0);
95 95
96 skb_queue_walk(&sk->sk_write_queue, skb) { 96 skb_queue_walk(&sk->sk_write_queue, skb) {
97 csum = csum_add(csum, skb->csum); 97 csum = csum_add(csum, skb->csum);
diff --git a/include/net/udplite.h b/include/net/udplite.h
index 1473b3e4904..406eb755b34 100644
--- a/include/net/udplite.h
+++ b/include/net/udplite.h
@@ -124,10 +124,10 @@ static inline int udplite_sender_cscov(struct udp_sock *up, struct udphdr *uh)
124 return cscov; 124 return cscov;
125} 125}
126 126
127static inline u32 udplite_csum_outgoing(struct sock *sk, struct sk_buff *skb) 127static inline __wsum udplite_csum_outgoing(struct sock *sk, struct sk_buff *skb)
128{ 128{
129 u32 csum = 0;
130 int off, len, cscov = udplite_sender_cscov(udp_sk(sk), skb->h.uh); 129 int off, len, cscov = udplite_sender_cscov(udp_sk(sk), skb->h.uh);
130 __wsum csum = 0;
131 131
132 skb->ip_summed = CHECKSUM_NONE; /* no HW support for checksumming */ 132 skb->ip_summed = CHECKSUM_NONE; /* no HW support for checksumming */
133 133