diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2006-11-15 00:40:42 -0500 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2006-12-03 00:23:38 -0500 |
commit | b51655b958dfb1176bfcf99466231fdbef8751ff (patch) | |
tree | a53d0ec00d8db4169ba8c1c487fffbd34d6dde03 /net/ipv6 | |
parent | b1550f221255f7dd06048d832bf0f3d166840e1c (diff) |
[NET]: Annotate __skb_checksum_complete() and friends.
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/netfilter.c | 4 | ||||
-rw-r--r-- | net/ipv6/tcp_ipv6.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/net/ipv6/netfilter.c b/net/ipv6/netfilter.c index 8d1b542806c1..f6294e5bcb31 100644 --- a/net/ipv6/netfilter.c +++ b/net/ipv6/netfilter.c | |||
@@ -80,11 +80,11 @@ static int nf_ip6_reroute(struct sk_buff **pskb, const struct nf_info *info) | |||
80 | return 0; | 80 | return 0; |
81 | } | 81 | } |
82 | 82 | ||
83 | unsigned int nf_ip6_checksum(struct sk_buff *skb, unsigned int hook, | 83 | __sum16 nf_ip6_checksum(struct sk_buff *skb, unsigned int hook, |
84 | unsigned int dataoff, u_int8_t protocol) | 84 | unsigned int dataoff, u_int8_t protocol) |
85 | { | 85 | { |
86 | struct ipv6hdr *ip6h = skb->nh.ipv6h; | 86 | struct ipv6hdr *ip6h = skb->nh.ipv6h; |
87 | unsigned int csum = 0; | 87 | __sum16 csum = 0; |
88 | 88 | ||
89 | switch (skb->ip_summed) { | 89 | switch (skb->ip_summed) { |
90 | case CHECKSUM_COMPLETE: | 90 | case CHECKSUM_COMPLETE: |
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c index 394bc54c5c21..147ce499f509 100644 --- a/net/ipv6/tcp_ipv6.c +++ b/net/ipv6/tcp_ipv6.c | |||
@@ -1527,7 +1527,7 @@ out: | |||
1527 | return NULL; | 1527 | return NULL; |
1528 | } | 1528 | } |
1529 | 1529 | ||
1530 | static int tcp_v6_checksum_init(struct sk_buff *skb) | 1530 | static __sum16 tcp_v6_checksum_init(struct sk_buff *skb) |
1531 | { | 1531 | { |
1532 | if (skb->ip_summed == CHECKSUM_COMPLETE) { | 1532 | if (skb->ip_summed == CHECKSUM_COMPLETE) { |
1533 | if (!tcp_v6_check(skb->h.th,skb->len,&skb->nh.ipv6h->saddr, | 1533 | if (!tcp_v6_check(skb->h.th,skb->len,&skb->nh.ipv6h->saddr, |