Commit 5084205f authored by Al Viro's avatar Al Viro Committed by David S. Miller
Browse files

[NET]: Annotate callers of csum_partial_copy_...() and csum_and_copy...() in net/* 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 44bb9363

include/linux/skbuff.h

+1 −2
Original line number Diff line number Diff line
@@ -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);

include/net/sock.h

+1 −1
Original line number Diff line number Diff line
@@ -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)

net/core/datagram.c

+3 −3
Original line number Diff line number Diff line
@@ -321,7 +321,7 @@ int skb_copy_datagram_iovec(const struct sk_buff *skb, int offset, 


static int skb_copy_and_csum_datagram(const struct sk_buff *skb, int offset,

				      u8 __user *to, int len,

				      unsigned int *csump)

				      __wsum *csump)

{

	int start = skb_headlen(skb);

	int pos = 0;
@@ -350,7 +350,7 @@ static int skb_copy_and_csum_datagram(const struct sk_buff *skb, int offset, 


		end = start + skb_shinfo(skb)->frags[i].size;

		if ((copy = end - offset) > 0) {

			unsigned int csum2;

			__wsum csum2;

			int err = 0;

			u8  *vaddr;

			skb_frag_t *frag = &skb_shinfo(skb)->frags[i];
@@ -386,7 +386,7 @@ static int skb_copy_and_csum_datagram(const struct sk_buff *skb, int offset, 


			end = start + list->len;

			if ((copy = end - offset) > 0) {

				unsigned int csum2 = 0;

				__wsum csum2 = 0;

				if (copy > len)

					copy = len;

				if (skb_copy_and_csum_datagram(list,

net/core/skbuff.c

+1 −1
Original line number Diff line number Diff line
@@ -1342,7 +1342,7 @@ unsigned int skb_copy_and_csum_bits(const struct sk_buff *skb, int offset, 


		end = start + skb_shinfo(skb)->frags[i].size;

		if ((copy = end - offset) > 0) {

			unsigned int csum2;

			__wsum csum2;

			u8 *vaddr;

			skb_frag_t *frag = &skb_shinfo(skb)->frags[i];

net/ipv4/ip_output.c

+1 −1
Original line number Diff line number Diff line
@@ -1314,7 +1314,7 @@ void ip_flush_pending_frames(struct sock *sk) 
static int ip_reply_glue_bits(void *dptr, char *to, int offset, 

			      int len, int odd, struct sk_buff *skb)

{

	unsigned int csum;

	__wsum csum;



	csum = csum_partial_copy_nocheck(dptr+offset, to, len, 0);

	skb->csum = csum_block_add(skb->csum, csum, odd);