diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2006-11-14 21:36:54 -0800 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2006-12-02 21:23:34 -0800 |
| commit | 5f92a7388a29594d6c365b23a48d4bb8299a3ea7 (patch) | |
| tree | 569e888e3b87dd77fa3eafa36dac96f2e1da00c5 /net/ipv6 | |
| parent | 5084205faf45384fff25c4cf77dd5c96279283ad (diff) | |
| download | op-kernel-dev-5f92a7388a29594d6c365b23a48d4bb8299a3ea7.zip op-kernel-dev-5f92a7388a29594d6c365b23a48d4bb8299a3ea7.tar.gz | |
[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/ipv6')
| -rw-r--r-- | net/ipv6/icmp.c | 2 | ||||
| -rw-r--r-- | net/ipv6/raw.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/icmp.c b/net/ipv6/icmp.c index 4ab8acf..3dcc4b7 100644 --- a/net/ipv6/icmp.c +++ b/net/ipv6/icmp.c @@ -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); diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c index cee5db2..9b21d67 100644 --- a/net/ipv6/raw.c +++ b/net/ipv6/raw.c @@ -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, |
