[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>

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);
    Returns true or false. */
 extern int skb_make_writable(struct sk_buff *skb, unsigned int writable_len);
 
-static inline void nf_csum_replace4(__sum16 *sum, __be32 from, __be32 to)
-{
-        __be32 diff[] = { ~from, to };
-
-        *sum = csum_fold(csum_partial((char *)diff, sizeof(diff), ~csum_unfold(*sum)));
-}
-
-static inline void nf_csum_replace2(__sum16 *sum, __be16 from, __be16 to)
-{
-        nf_csum_replace4(sum, (__force __be32)from, (__force __be32)to);
-}
-
-extern void nf_proto_csum_replace4(__sum16 *sum, struct sk_buff *skb,
-                                      __be32 from, __be32 to, int pseudohdr);
-
-static inline void nf_proto_csum_replace2(__sum16 *sum, struct sk_buff *skb,
-                                      __be16 from, __be16 to, int pseudohdr)
-{
-        nf_proto_csum_replace4(sum, skb, (__force __be32)from,
-                                (__force __be32)to, pseudohdr);
-}
+#define nf_csum_replace4        csum_replace4
+#define nf_csum_replace2        csum_replace2
+#define nf_proto_csum_replace4  inet_proto_csum_replace4
+#define nf_proto_csum_replace2  inet_proto_csum_replace2
 
 struct nf_afinfo {
         unsigned short  family;