Commit 8d5930df authored by Al Viro's avatar Al Viro
Browse files

skb_copy_and_csum_bits(): don't bother with the last argument 



it's always 0

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 9123e3a7

drivers/net/ethernet/sun/sunvnet_common.c

+1 −1
Original line number Diff line number Diff line
@@ -1168,7 +1168,7 @@ static inline struct sk_buff *vnet_skb_shape(struct sk_buff *skb, int ncookies) 
			*(__sum16 *)(skb->data + offset) = 0;

			csum = skb_copy_and_csum_bits(skb, start,

						      nskb->data + start,

						      skb->len - start, 0);

						      skb->len - start);



			/* add in the header checksums */

			if (skb->protocol == htons(ETH_P_IP)) {

include/linux/skbuff.h

+1 −1
Original line number Diff line number Diff line
@@ -3535,7 +3535,7 @@ int skb_kill_datagram(struct sock *sk, struct sk_buff *skb, unsigned int flags); 
int skb_copy_bits(const struct sk_buff *skb, int offset, void *to, int len);

int skb_store_bits(struct sk_buff *skb, int offset, const void *from, int len);

__wsum skb_copy_and_csum_bits(const struct sk_buff *skb, int offset, u8 *to,

			      int len, __wsum csum);

			      int len);

int skb_splice_bits(struct sk_buff *skb, struct sock *sk, unsigned int offset,

		    struct pipe_inode_info *pipe, unsigned int len,

		    unsigned int flags);

net/core/skbuff.c

+6 −5
Original line number Diff line number Diff line
@@ -2723,19 +2723,20 @@ EXPORT_SYMBOL(skb_checksum); 
/* Both of above in one bottle. */



__wsum skb_copy_and_csum_bits(const struct sk_buff *skb, int offset,

				    u8 *to, int len, __wsum csum)

				    u8 *to, int len)

{

	int start = skb_headlen(skb);

	int i, copy = start - offset;

	struct sk_buff *frag_iter;

	int pos = 0;

	__wsum csum = 0;



	/* Copy header. */

	if (copy > 0) {

		if (copy > len)

			copy = len;

		csum = csum_partial_copy_nocheck(skb->data + offset, to,

						 copy, csum);

						 copy, 0);

		if ((len -= copy) == 0)

			return csum;

		offset += copy;
@@ -2791,7 +2792,7 @@ __wsum skb_copy_and_csum_bits(const struct sk_buff *skb, int offset, 
				copy = len;

			csum2 = skb_copy_and_csum_bits(frag_iter,

						       offset - start,

						       to, copy, 0);

						       to, copy);

			csum = csum_block_add(csum, csum2, pos);

			if ((len -= copy) == 0)

				return csum;
@@ -3011,7 +3012,7 @@ void skb_copy_and_csum_dev(const struct sk_buff *skb, u8 *to) 
	csum = 0;

	if (csstart != skb->len)

		csum = skb_copy_and_csum_bits(skb, csstart, to + csstart,

					      skb->len - csstart, 0);

					      skb->len - csstart);



	if (skb->ip_summed == CHECKSUM_PARTIAL) {

		long csstuff = csstart + skb->csum_offset;
@@ -3932,7 +3933,7 @@ struct sk_buff *skb_segment(struct sk_buff *head_skb, 
					skb_copy_and_csum_bits(head_skb, offset,

							       skb_put(nskb,

								       len),

							       len, 0);

							       len);

				SKB_GSO_CB(nskb)->csum_start =

					skb_headroom(nskb) + doffset;

			} else {

net/ipv4/icmp.c

+1 −1
Original line number Diff line number Diff line
@@ -352,7 +352,7 @@ static int icmp_glue_bits(void *from, char *to, int offset, int len, int odd, 


	csum = skb_copy_and_csum_bits(icmp_param->skb,

				      icmp_param->offset + offset,

				      to, len, 0);

				      to, len);



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

	if (icmp_pointers[icmp_param->data.icmph.type].error)

net/ipv4/ip_output.c

+2 −2
Original line number Diff line number Diff line
@@ -1126,7 +1126,7 @@ static int __ip_append_data(struct sock *sk, 
			if (fraggap) {

				skb->csum = skb_copy_and_csum_bits(

					skb_prev, maxfraglen,

					data + transhdrlen, fraggap, 0);

					data + transhdrlen, fraggap);

				skb_prev->csum = csum_sub(skb_prev->csum,

							  skb->csum);

				data += fraggap;
@@ -1411,7 +1411,7 @@ ssize_t ip_append_page(struct sock *sk, struct flowi4 *fl4, struct page *page, 
				skb->csum = skb_copy_and_csum_bits(skb_prev,

								   maxfraglen,

						    skb_transport_header(skb),

								   fraggap, 0);

								   fraggap);

				skb_prev->csum = csum_sub(skb_prev->csum,

							  skb->csum);

				pskb_trim_unique(skb_prev, maxfraglen);