aboutsummaryrefslogtreecommitdiffstats
path: root/include/net
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2006-11-14 21:35:48 -0800
committerDavid S. Miller <davem@sunset.davemloft.net>2006-12-02 21:23:31 -0800
commit868c86bcb5bdea7ed8d45979b17bb919af9254db (patch)
treeebc232092d6a8a75261a9e3f698206cc09740fdf /include/net
parent[NET]: Annotate csum_tcpudp_magic() callers in net/* (diff)
downloadlinux-dev-868c86bcb5bdea7ed8d45979b17bb919af9254db.tar.xz
linux-dev-868c86bcb5bdea7ed8d45979b17bb919af9254db.zip
[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 4f0626735ed3..39e825a6909a 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)
* @skb: sk_buff containing the filled-in UDP header
* (checksum field must be zeroed out)
*/
-static inline u32 udp_csum_outgoing(struct sock *sk, struct sk_buff *skb)
+static inline __wsum udp_csum_outgoing(struct sock *sk, struct sk_buff *skb)
{
- u32 csum = csum_partial(skb->h.raw, sizeof(struct udphdr), 0);
+ __wsum csum = csum_partial(skb->h.raw, sizeof(struct udphdr), 0);
skb_queue_walk(&sk->sk_write_queue, skb) {
csum = csum_add(csum, skb->csum);
diff --git a/include/net/udplite.h b/include/net/udplite.h
index 1473b3e49044..406eb755b34e 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)
return cscov;
}
-static inline u32 udplite_csum_outgoing(struct sock *sk, struct sk_buff *skb)
+static inline __wsum udplite_csum_outgoing(struct sock *sk, struct sk_buff *skb)
{
- u32 csum = 0;
int off, len, cscov = udplite_sender_cscov(udp_sk(sk), skb->h.uh);
+ __wsum csum = 0;
skb->ip_summed = CHECKSUM_NONE; /* no HW support for checksumming */