diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2006-11-15 00:36:54 -0500 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2006-12-03 00:23:34 -0500 |
commit | 5f92a7388a29594d6c365b23a48d4bb8299a3ea7 (patch) | |
tree | 569e888e3b87dd77fa3eafa36dac96f2e1da00c5 /net/ipv4 | |
parent | 5084205faf45384fff25c4cf77dd5c96279283ad (diff) |
[NET]: Annotate callers of the reset of checksum.h stuff.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4')
-rw-r--r-- | net/ipv4/icmp.c | 2 | ||||
-rw-r--r-- | net/ipv4/ip_gre.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/icmp.c b/net/ipv4/icmp.c index cb9da0842b77..40cf0d0e1b83 100644 --- a/net/ipv4/icmp.c +++ b/net/ipv4/icmp.c | |||
@@ -332,7 +332,7 @@ static int icmp_glue_bits(void *from, char *to, int offset, int len, int odd, | |||
332 | struct sk_buff *skb) | 332 | struct sk_buff *skb) |
333 | { | 333 | { |
334 | struct icmp_bxm *icmp_param = (struct icmp_bxm *)from; | 334 | struct icmp_bxm *icmp_param = (struct icmp_bxm *)from; |
335 | unsigned int csum; | 335 | __wsum csum; |
336 | 336 | ||
337 | csum = skb_copy_and_csum_bits(icmp_param->skb, | 337 | csum = skb_copy_and_csum_bits(icmp_param->skb, |
338 | icmp_param->offset + offset, | 338 | icmp_param->offset + offset, |
diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c index 2bf54adee8c2..476cb6084c75 100644 --- a/net/ipv4/ip_gre.c +++ b/net/ipv4/ip_gre.c | |||
@@ -877,7 +877,7 @@ static int ipgre_tunnel_xmit(struct sk_buff *skb, struct net_device *dev) | |||
877 | } | 877 | } |
878 | if (tunnel->parms.o_flags&GRE_CSUM) { | 878 | if (tunnel->parms.o_flags&GRE_CSUM) { |
879 | *ptr = 0; | 879 | *ptr = 0; |
880 | *(__be16*)ptr = ip_compute_csum((void*)(iph+1), skb->len - sizeof(struct iphdr)); | 880 | *(__sum16*)ptr = ip_compute_csum((void*)(iph+1), skb->len - sizeof(struct iphdr)); |
881 | } | 881 | } |
882 | } | 882 | } |
883 | 883 | ||