diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2006-11-14 21:36:34 -0800 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2006-12-02 21:23:33 -0800 |
commit | 5084205faf45384fff25c4cf77dd5c96279283ad (patch) | |
tree | 9a5a3cb74bf64a6ec4c1b77d7805b256978943ca /include | |
parent | 44bb93633f57a55979f3c2589b10fd6a2bfc7c08 (diff) | |
download | kernel_samsung_smdk4412-5084205faf45384fff25c4cf77dd5c96279283ad.zip kernel_samsung_smdk4412-5084205faf45384fff25c4cf77dd5c96279283ad.tar.gz kernel_samsung_smdk4412-5084205faf45384fff25c4cf77dd5c96279283ad.tar.bz2 |
[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')
-rw-r--r-- | include/linux/skbuff.h | 3 | ||||
-rw-r--r-- | include/net/sock.h | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index e3ae544..64fa7f4 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -1199,8 +1199,7 @@ static inline int skb_add_data(struct sk_buff *skb, if (skb->ip_summed == CHECKSUM_NONE) { int err = 0; - unsigned int csum = csum_and_copy_from_user(from, - skb_put(skb, copy), + __wsum csum = csum_and_copy_from_user(from, skb_put(skb, copy), copy, 0, &err); if (!err) { skb->csum = csum_block_add(skb->csum, csum, off); diff --git a/include/net/sock.h b/include/net/sock.h index 35ffbdd..dc4b92b 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) |