summaryrefslogtreecommitdiffstats
path: root/include/net/sock.h
diff options
context:
space:
mode:
authorAl Viro2006-11-15 06:36:34 +0100
committerDavid S. Miller2006-12-03 06:23:33 +0100
commit5084205faf45384fff25c4cf77dd5c96279283ad (patch)
tree9a5a3cb74bf64a6ec4c1b77d7805b256978943ca /include/net/sock.h
parent[NET]: Annotate csum_partial() callers in net/* (diff)
downloadkernel-qcow2-linux-5084205faf45384fff25c4cf77dd5c96279283ad.tar.gz
kernel-qcow2-linux-5084205faf45384fff25c4cf77dd5c96279283ad.tar.xz
kernel-qcow2-linux-5084205faf45384fff25c4cf77dd5c96279283ad.zip
[NET]: Annotate callers of csum_partial_copy_...() and csum_and_copy...() 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/sock.h')
-rw-r--r--include/net/sock.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/sock.h b/include/net/sock.h
index 35ffbdd35d3e..dc4b92b8abea 100644
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -1088,7 +1088,7 @@ static inline int skb_copy_to_page(struct sock *sk, char __user *from,
{
if (skb->ip_summed == CHECKSUM_NONE) {
int err = 0;
- unsigned int csum = csum_and_copy_from_user(from,
+ __wsum csum = csum_and_copy_from_user(from,
page_address(page) + off,
copy, 0, &err);
if (err)