diff options
| author | Al Viro | 2006-11-15 06:24:49 +0100 |
|---|---|---|
| committer | David S. Miller | 2006-12-03 06:23:27 +0100 |
| commit | d3bc23e7ee9db8023dff5a86bb3b0069ed018789 (patch) | |
| tree | f281b190a20084386666e0f3bb957df427b93ca7 /net/ipv4/tcp.c | |
| parent | [NET]: Annotate checksums in on-the-wire packets. (diff) | |
| download | kernel-qcow2-linux-d3bc23e7ee9db8023dff5a86bb3b0069ed018789.tar.gz kernel-qcow2-linux-d3bc23e7ee9db8023dff5a86bb3b0069ed018789.tar.xz kernel-qcow2-linux-d3bc23e7ee9db8023dff5a86bb3b0069ed018789.zip | |
[NET]: Annotate callers of csum_fold() in net/*
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/tcp.c')
| -rw-r--r-- | net/ipv4/tcp.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index dadef867a3bb..168f9de906bc 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -2162,7 +2162,7 @@ struct sk_buff *tcp_tso_segment(struct sk_buff *skb, int features) struct tcphdr *th; unsigned thlen; unsigned int seq; - unsigned int delta; + __be32 delta; unsigned int oldlen; unsigned int len; @@ -2215,7 +2215,8 @@ struct sk_buff *tcp_tso_segment(struct sk_buff *skb, int features) do { th->fin = th->psh = 0; - th->check = ~csum_fold(th->check + delta); + th->check = ~csum_fold((__force __wsum)((__force u32)th->check + + (__force u32)delta)); if (skb->ip_summed != CHECKSUM_PARTIAL) th->check = csum_fold(csum_partial(skb->h.raw, thlen, skb->csum)); @@ -2229,7 +2230,8 @@ struct sk_buff *tcp_tso_segment(struct sk_buff *skb, int features) } while (skb->next); delta = htonl(oldlen + (skb->tail - skb->h.raw) + skb->data_len); - th->check = ~csum_fold(th->check + delta); + th->check = ~csum_fold((__force __wsum)((__force u32)th->check + + (__force u32)delta)); if (skb->ip_summed != CHECKSUM_PARTIAL) th->check = csum_fold(csum_partial(skb->h.raw, thlen, skb->csum)); |