diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2006-11-14 21:26:08 -0800 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2006-12-02 21:23:28 -0800 |
| commit | d6f5493c1a42b1203e5b0cb0507afd00bb2927bf (patch) | |
| tree | 8f9e713f76b642a56e2c2b5e723bc50b9a07b27a | |
| parent | d3bc23e7ee9db8023dff5a86bb3b0069ed018789 (diff) | |
| download | linux-d6f5493c1a42b1203e5b0cb0507afd00bb2927bf.tar.gz linux-d6f5493c1a42b1203e5b0cb0507afd00bb2927bf.tar.bz2 linux-d6f5493c1a42b1203e5b0cb0507afd00bb2927bf.zip | |
[NET]: Annotate callers of csum_tcpudp_nofold() in net/*
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | include/net/ip.h | 2 | ||||
| -rw-r--r-- | net/core/netpoll.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/net/ip.h b/include/net/ip.h index 412e8114667d..eafbcaf728fd 100644 --- a/include/net/ip.h +++ b/include/net/ip.h @@ -135,7 +135,7 @@ static inline void ip_tr_mc_map(__be32 addr, char *buf) struct ip_reply_arg { struct kvec iov[1]; - u32 csum; + __wsum csum; int csumoffset; /* u16 offset of csum in iov[0].iov_base */ /* -1 if not needed */ }; diff --git a/net/core/netpoll.c b/net/core/netpoll.c index edd3246873e8..26ee1791aa02 100644 --- a/net/core/netpoll.c +++ b/net/core/netpoll.c @@ -78,9 +78,9 @@ static void queue_process(void *p) } static int checksum_udp(struct sk_buff *skb, struct udphdr *uh, - unsigned short ulen, u32 saddr, u32 daddr) + unsigned short ulen, __be32 saddr, __be32 daddr) { - unsigned int psum; + __wsum psum; if (uh->check == 0 || skb->ip_summed == CHECKSUM_UNNECESSARY) return 0; |