[NETFILTER]: Convert old checksum helper names

Kill the defines again, convert to the new checksum helper names and
remove the dependency of NET_ACT_NAT on NETFILTER.

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>

2 files changed, 6 insertions, 7 deletions

diff --git a/net/sched/Kconfig b/net/sched/Kconfig
index 9c15c4888d12..f5ab54b1edd3 100644
--- a/net/sched/Kconfig
+++ b/net/sched/Kconfig
@@ -445,7 +445,6 @@ config NET_ACT_IPT
 config NET_ACT_NAT
         tristate "Stateless NAT"
         depends on NET_CLS_ACT
-        select NETFILTER
         ---help---
           Say Y here to do stateless NAT on IPv4 packets.  You should use
           netfilter for NAT unless you know what you are doing.
diff --git a/net/sched/act_nat.c b/net/sched/act_nat.c
index c96273bcaf9c..da5c1eae4222 100644
--- a/net/sched/act_nat.c
+++ b/net/sched/act_nat.c
@@ -151,7 +151,7 @@ static int tcf_nat(struct sk_buff *skb, struct tc_action *a,
                 else
                         iph->daddr = new_addr;
 
-                nf_csum_replace4(&iph->check, addr, new_addr);
+                csum_replace4(&iph->check, addr, new_addr);
         }
 
         ihl = iph->ihl * 4;
@@ -169,7 +169,7 @@ static int tcf_nat(struct sk_buff *skb, struct tc_action *a,
                         goto drop;
 
                 tcph = (void *)(skb_network_header(skb) + ihl);
-                nf_proto_csum_replace4(&tcph->check, skb, addr, new_addr, 1);
+                inet_proto_csum_replace4(&tcph->check, skb, addr, new_addr, 1);
                 break;
         }
         case IPPROTO_UDP:
@@ -184,8 +184,8 @@ static int tcf_nat(struct sk_buff *skb, struct tc_action *a,
 
                 udph = (void *)(skb_network_header(skb) + ihl);
                 if (udph->check || skb->ip_summed == CHECKSUM_PARTIAL) {
-                        nf_proto_csum_replace4(&udph->check, skb, addr,
-                                               new_addr, 1);
+                        inet_proto_csum_replace4(&udph->check, skb, addr,
+                                                 new_addr, 1);
                         if (!udph->check)
                                 udph->check = CSUM_MANGLED_0;
                 }
@@ -232,8 +232,8 @@ static int tcf_nat(struct sk_buff *skb, struct tc_action *a,
                 else
                         iph->saddr = new_addr;
 
-                nf_proto_csum_replace4(&icmph->checksum, skb, addr, new_addr,
-                                       1);
+                inet_proto_csum_replace4(&icmph->checksum, skb, addr, new_addr,
+                                         1);
                 break;
         }
         default: