diff options
author | Herbert Xu <herbert@gondor.apana.org.au> | 2007-04-09 14:59:39 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-04-26 01:28:43 -0400 |
commit | 604763722c655c7e3f31ecf6f7b4dafcd26a7a15 (patch) | |
tree | a5c07f0e22ac86e7ca7a8c80bd3f111116610edd /net/ipv6/udp.c | |
parent | 628592ccdbbb5bb751217cf02e2e7abb500d7ffe (diff) |
[NET]: Treat CHECKSUM_PARTIAL as CHECKSUM_UNNECESSARY
When a transmitted packet is looped back directly, CHECKSUM_PARTIAL
maps to the semantics of CHECKSUM_UNNECESSARY. Therefore we should
treat it as such in the stack.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/udp.c')
-rw-r--r-- | net/ipv6/udp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c index 1e3dfb20b1cf..b083c09e3d2d 100644 --- a/net/ipv6/udp.c +++ b/net/ipv6/udp.c | |||
@@ -153,7 +153,7 @@ try_again: | |||
153 | goto csum_copy_err; | 153 | goto csum_copy_err; |
154 | } | 154 | } |
155 | 155 | ||
156 | if (skb->ip_summed == CHECKSUM_UNNECESSARY) | 156 | if (skb_csum_unnecessary(skb)) |
157 | err = skb_copy_datagram_iovec(skb, sizeof(struct udphdr), | 157 | err = skb_copy_datagram_iovec(skb, sizeof(struct udphdr), |
158 | msg->msg_iov, copied ); | 158 | msg->msg_iov, copied ); |
159 | else { | 159 | else { |
@@ -397,7 +397,7 @@ static inline int udp6_csum_init(struct sk_buff *skb, struct udphdr *uh, | |||
397 | skb->len, proto, skb->csum)) | 397 | skb->len, proto, skb->csum)) |
398 | skb->ip_summed = CHECKSUM_UNNECESSARY; | 398 | skb->ip_summed = CHECKSUM_UNNECESSARY; |
399 | 399 | ||
400 | if (skb->ip_summed != CHECKSUM_UNNECESSARY) | 400 | if (!skb_csum_unnecessary(skb)) |
401 | skb->csum = ~csum_unfold(csum_ipv6_magic(&ipv6_hdr(skb)->saddr, | 401 | skb->csum = ~csum_unfold(csum_ipv6_magic(&ipv6_hdr(skb)->saddr, |
402 | &ipv6_hdr(skb)->daddr, | 402 | &ipv6_hdr(skb)->daddr, |
403 | skb->len, proto, 0)); | 403 | skb->len, proto, 0)); |