diff options
author | Patrick McHardy <kaber@trash.net> | 2012-08-26 13:14:10 -0400 |
---|---|---|
committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2012-08-29 21:00:16 -0400 |
commit | 2cf545e835aae92173ef0b1f4af385e9c40f21e8 (patch) | |
tree | b03bf5a155eed859a9852922a4311340a598c725 | |
parent | 0ad352cb433ed2b05921a32b5ee20410512e2320 (diff) |
net: core: add function for incremental IPv6 pseudo header checksum updates
Add inet_proto_csum_replace16 for incrementally updating IPv6 pseudo header
checksums for IPv6 NAT.
Signed-off-by: Patrick McHardy <kaber@trash.net>
Acked-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | include/net/checksum.h | 3 | ||||
-rw-r--r-- | net/core/utils.c | 20 |
2 files changed, 23 insertions, 0 deletions
diff --git a/include/net/checksum.h b/include/net/checksum.h index ba55d8b8c87c..600d1d705bb8 100644 --- a/include/net/checksum.h +++ b/include/net/checksum.h | |||
@@ -109,6 +109,9 @@ static inline void csum_replace2(__sum16 *sum, __be16 from, __be16 to) | |||
109 | struct sk_buff; | 109 | struct sk_buff; |
110 | extern void inet_proto_csum_replace4(__sum16 *sum, struct sk_buff *skb, | 110 | extern void inet_proto_csum_replace4(__sum16 *sum, struct sk_buff *skb, |
111 | __be32 from, __be32 to, int pseudohdr); | 111 | __be32 from, __be32 to, int pseudohdr); |
112 | extern void inet_proto_csum_replace16(__sum16 *sum, struct sk_buff *skb, | ||
113 | const __be32 *from, const __be32 *to, | ||
114 | int pseudohdr); | ||
112 | 115 | ||
113 | static inline void inet_proto_csum_replace2(__sum16 *sum, struct sk_buff *skb, | 116 | static inline void inet_proto_csum_replace2(__sum16 *sum, struct sk_buff *skb, |
114 | __be16 from, __be16 to, | 117 | __be16 from, __be16 to, |
diff --git a/net/core/utils.c b/net/core/utils.c index 39895a65e54a..f5613d569c23 100644 --- a/net/core/utils.c +++ b/net/core/utils.c | |||
@@ -294,6 +294,26 @@ void inet_proto_csum_replace4(__sum16 *sum, struct sk_buff *skb, | |||
294 | } | 294 | } |
295 | EXPORT_SYMBOL(inet_proto_csum_replace4); | 295 | EXPORT_SYMBOL(inet_proto_csum_replace4); |
296 | 296 | ||
297 | void inet_proto_csum_replace16(__sum16 *sum, struct sk_buff *skb, | ||
298 | const __be32 *from, const __be32 *to, | ||
299 | int pseudohdr) | ||
300 | { | ||
301 | __be32 diff[] = { | ||
302 | ~from[0], ~from[1], ~from[2], ~from[3], | ||
303 | to[0], to[1], to[2], to[3], | ||
304 | }; | ||
305 | if (skb->ip_summed != CHECKSUM_PARTIAL) { | ||
306 | *sum = csum_fold(csum_partial(diff, sizeof(diff), | ||
307 | ~csum_unfold(*sum))); | ||
308 | if (skb->ip_summed == CHECKSUM_COMPLETE && pseudohdr) | ||
309 | skb->csum = ~csum_partial(diff, sizeof(diff), | ||
310 | ~skb->csum); | ||
311 | } else if (pseudohdr) | ||
312 | *sum = ~csum_fold(csum_partial(diff, sizeof(diff), | ||
313 | csum_unfold(*sum))); | ||
314 | } | ||
315 | EXPORT_SYMBOL(inet_proto_csum_replace16); | ||
316 | |||
297 | int mac_pton(const char *s, u8 *mac) | 317 | int mac_pton(const char *s, u8 *mac) |
298 | { | 318 | { |
299 | int i; | 319 | int i; |