diff options
Diffstat (limited to 'net/core/utils.c')
-rw-r--r-- | net/core/utils.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/net/core/utils.c b/net/core/utils.c index eed34338736c..efc76dd9dcd1 100644 --- a/net/core/utils.c +++ b/net/core/utils.c | |||
@@ -306,16 +306,14 @@ EXPORT_SYMBOL(in6_pton); | |||
306 | void inet_proto_csum_replace4(__sum16 *sum, struct sk_buff *skb, | 306 | void inet_proto_csum_replace4(__sum16 *sum, struct sk_buff *skb, |
307 | __be32 from, __be32 to, int pseudohdr) | 307 | __be32 from, __be32 to, int pseudohdr) |
308 | { | 308 | { |
309 | __be32 diff[] = { ~from, to }; | ||
310 | if (skb->ip_summed != CHECKSUM_PARTIAL) { | 309 | if (skb->ip_summed != CHECKSUM_PARTIAL) { |
311 | *sum = csum_fold(csum_partial(diff, sizeof(diff), | 310 | *sum = csum_fold(csum_add(csum_sub(~csum_unfold(*sum), from), |
312 | ~csum_unfold(*sum))); | 311 | to)); |
313 | if (skb->ip_summed == CHECKSUM_COMPLETE && pseudohdr) | 312 | if (skb->ip_summed == CHECKSUM_COMPLETE && pseudohdr) |
314 | skb->csum = ~csum_partial(diff, sizeof(diff), | 313 | skb->csum = ~csum_add(csum_sub(~(skb->csum), from), to); |
315 | ~skb->csum); | ||
316 | } else if (pseudohdr) | 314 | } else if (pseudohdr) |
317 | *sum = ~csum_fold(csum_partial(diff, sizeof(diff), | 315 | *sum = ~csum_fold(csum_add(csum_sub(csum_unfold(*sum), from), |
318 | csum_unfold(*sum))); | 316 | to)); |
319 | } | 317 | } |
320 | EXPORT_SYMBOL(inet_proto_csum_replace4); | 318 | EXPORT_SYMBOL(inet_proto_csum_replace4); |
321 | 319 | ||