Commit 5f92a738 authored by Al Viro's avatar Al Viro Committed by David S. Miller
Browse files

[NET]: Annotate callers of the reset of checksum.h stuff. 



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

net/core/skbuff.c

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


			end = start + list->len;

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

				unsigned int csum2;

				__wsum csum2;

				if (copy > len)

					copy = len;

				csum2 = skb_checksum(list, offset - start,

net/ipv4/icmp.c

+1 −1
Original line number Diff line number Diff line
@@ -332,7 +332,7 @@ static int icmp_glue_bits(void *from, char *to, int offset, int len, int odd, 
			  struct sk_buff *skb)

{

	struct icmp_bxm *icmp_param = (struct icmp_bxm *)from;

	unsigned int csum;

	__wsum csum;



	csum = skb_copy_and_csum_bits(icmp_param->skb,

				      icmp_param->offset + offset,

net/ipv4/ip_gre.c

+1 −1
Original line number Diff line number Diff line
@@ -877,7 +877,7 @@ static int ipgre_tunnel_xmit(struct sk_buff *skb, struct net_device *dev) 
		}

		if (tunnel->parms.o_flags&GRE_CSUM) {

			*ptr = 0;

			*(__be16*)ptr = ip_compute_csum((void*)(iph+1), skb->len - sizeof(struct iphdr));

			*(__sum16*)ptr = ip_compute_csum((void*)(iph+1), skb->len - sizeof(struct iphdr));

		}

	}

net/ipv6/icmp.c

+1 −1
Original line number Diff line number Diff line
@@ -262,7 +262,7 @@ static int icmpv6_getfrag(void *from, char *to, int offset, int len, int odd, st 
{

	struct icmpv6_msg *msg = (struct icmpv6_msg *) from;

	struct sk_buff *org_skb = msg->skb;

	__u32 csum = 0;

	__wsum csum = 0;



	csum = skb_copy_and_csum_bits(org_skb, msg->offset + offset,

				      to, len, csum);

net/ipv6/raw.c

+1 −1
Original line number Diff line number Diff line
@@ -530,7 +530,7 @@ static int rawv6_push_pending_frames(struct sock *sk, struct flowi *fl, 


	/* in case cksum was not initialized */

	if (unlikely(csum))

		tmp_csum = csum_sub(tmp_csum, csum);

		tmp_csum = csum_sub(tmp_csum, csum_unfold(csum));



	csum = csum_ipv6_magic(&fl->fl6_src,

				   &fl->fl6_dst,