netfilter: nat: remove csum_recalc hook

[linux-2.6-microblaze.git] / net / netfilter / nf_nat_helper.c

diff --git a/net/netfilter/nf_nat_helper.c b/net/netfilter/nf_nat_helper.c
index 12dea97..0a8dd5f 100644 (file)
--- a/net/netfilter/nf_nat_helper.c
+++ b/net/netfilter/nf_nat_helper.c
@@ -97,7 +97,6 @@ bool __nf_nat_mangle_tcp_packet(struct sk_buff *skb,
                                const char *rep_buffer,
                                unsigned int rep_len, bool adjust)
 {
-       const struct nf_nat_l3proto *l3proto;
        struct tcphdr *tcph;
        int oldlen, datalen;
 
@@ -117,9 +116,8 @@ bool __nf_nat_mangle_tcp_packet(struct sk_buff *skb,
 
        datalen = skb->len - protoff;
 
-       l3proto = __nf_nat_l3proto_find(nf_ct_l3num(ct));
-       l3proto->csum_recalc(skb, IPPROTO_TCP, tcph, &tcph->check,
-                            datalen, oldlen);
+       nf_nat_csum_recalc(skb, nf_ct_l3num(ct), IPPROTO_TCP,
+                          tcph, &tcph->check, datalen, oldlen);
 
        if (adjust && rep_len != match_len)
                nf_ct_seqadj_set(ct, ctinfo, tcph->seq,
@@ -149,7 +147,6 @@ nf_nat_mangle_udp_packet(struct sk_buff *skb,
                         const char *rep_buffer,
                         unsigned int rep_len)
 {
-       const struct nf_nat_l3proto *l3proto;
        struct udphdr *udph;
        int datalen, oldlen;
 
@@ -175,9 +172,8 @@ nf_nat_mangle_udp_packet(struct sk_buff *skb,
        if (!udph->check && skb->ip_summed != CHECKSUM_PARTIAL)
                return true;
 
-       l3proto = __nf_nat_l3proto_find(nf_ct_l3num(ct));
-       l3proto->csum_recalc(skb, IPPROTO_UDP, udph, &udph->check,
-                            datalen, oldlen);
+       nf_nat_csum_recalc(skb, nf_ct_l3num(ct), IPPROTO_TCP,
+                          udph, &udph->check, datalen, oldlen);
 
        return true;
 }