aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2006-11-15 00:36:34 -0500
committerDavid S. Miller <davem@sunset.davemloft.net>2006-12-03 00:23:33 -0500
commit5084205faf45384fff25c4cf77dd5c96279283ad (patch)
tree9a5a3cb74bf64a6ec4c1b77d7805b256978943ca /include
parent44bb93633f57a55979f3c2589b10fd6a2bfc7c08 (diff)
[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.h3
-rw-r--r--include/net/sock.h2
2 files changed, 2 insertions, 3 deletions
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index e3ae544b3956..64fa7f4c702d 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,
1199 1199
1200 if (skb->ip_summed == CHECKSUM_NONE) { 1200 if (skb->ip_summed == CHECKSUM_NONE) {
1201 int err = 0; 1201 int err = 0;
1202 unsigned int csum = csum_and_copy_from_user(from, 1202 __wsum csum = csum_and_copy_from_user(from, skb_put(skb, copy),
1203 skb_put(skb, copy),
1204 copy, 0, &err); 1203 copy, 0, &err);
1205 if (!err) { 1204 if (!err) {
1206 skb->csum = csum_block_add(skb->csum, csum, off); 1205 skb->csum = csum_block_add(skb->csum, csum, off);
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,
1088{ 1088{
1089 if (skb->ip_summed == CHECKSUM_NONE) { 1089 if (skb->ip_summed == CHECKSUM_NONE) {
1090 int err = 0; 1090 int err = 0;
1091 unsigned int csum = csum_and_copy_from_user(from, 1091 __wsum csum = csum_and_copy_from_user(from,
1092 page_address(page) + off, 1092 page_address(page) + off,
1093 copy, 0, &err); 1093 copy, 0, &err);
1094 if (err) 1094 if (err)