aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorPatrick McHardy <kaber@trash.net>2007-11-29 09:14:30 -0500
committerDavid S. Miller <davem@davemloft.net>2008-01-28 17:55:14 -0500
commita99a00cf1adef2d3dce745c93c9cc8b0a1612c50 (patch)
tree4629669029f845ae141693578a899505cde577e9 /include/linux
parent3159afe0d2c1994392c269cf9dee2797830d016b (diff)
[NET]: Move netfilter checksum helpers to net/core/utils.c
This allows to get rid of the CONFIG_NETFILTER dependency of NET_ACT_NAT. This patch redefines the old names to keep the noise low, the next patch converts all users. Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/netfilter.h25
1 files changed, 4 insertions, 21 deletions
diff --git a/include/linux/netfilter.h b/include/linux/netfilter.h
index 25fc12260340..e2bf6d2ffb6c 100644
--- a/include/linux/netfilter.h
+++ b/include/linux/netfilter.h
@@ -298,27 +298,10 @@ extern void nf_invalidate_cache(int pf);
298 Returns true or false. */ 298 Returns true or false. */
299extern int skb_make_writable(struct sk_buff *skb, unsigned int writable_len); 299extern int skb_make_writable(struct sk_buff *skb, unsigned int writable_len);
300 300
301static inline void nf_csum_replace4(__sum16 *sum, __be32 from, __be32 to) 301#define nf_csum_replace4 csum_replace4
302{ 302#define nf_csum_replace2 csum_replace2
303 __be32 diff[] = { ~from, to }; 303#define nf_proto_csum_replace4 inet_proto_csum_replace4
304 304#define nf_proto_csum_replace2 inet_proto_csum_replace2
305 *sum = csum_fold(csum_partial((char *)diff, sizeof(diff), ~csum_unfold(*sum)));
306}
307
308static inline void nf_csum_replace2(__sum16 *sum, __be16 from, __be16 to)
309{
310 nf_csum_replace4(sum, (__force __be32)from, (__force __be32)to);
311}
312
313extern void nf_proto_csum_replace4(__sum16 *sum, struct sk_buff *skb,
314 __be32 from, __be32 to, int pseudohdr);
315
316static inline void nf_proto_csum_replace2(__sum16 *sum, struct sk_buff *skb,
317 __be16 from, __be16 to, int pseudohdr)
318{
319 nf_proto_csum_replace4(sum, skb, (__force __be32)from,
320 (__force __be32)to, pseudohdr);
321}
322 305
323struct nf_afinfo { 306struct nf_afinfo {
324 unsigned short family; 307 unsigned short family;