netfilter: add protocol independent NAT core

[~andy/linux] / net / ipv4 / netfilter / nf_nat_ftp.c

diff --git a/net/ipv4/netfilter/nf_nat_ftp.c b/net/ipv4/netfilter/nf_nat_ftp.c
index e462a957d0805c324fa3db0bdd8d8a317b629f59..dd5e387fc03ba5ba48e08c9acaf30f369b9f9a76 100644 (file)
--- a/net/ipv4/netfilter/nf_nat_ftp.c
+++ b/net/ipv4/netfilter/nf_nat_ftp.c
@@ -15,7 +15,6 @@
 #include <linux/netfilter_ipv4.h>
 #include <net/netfilter/nf_nat.h>
 #include <net/netfilter/nf_nat_helper.h>
-#include <net/netfilter/nf_nat_rule.h>
 #include <net/netfilter/nf_conntrack_helper.h>
 #include <net/netfilter/nf_conntrack_expect.h>
 #include <linux/netfilter/nf_conntrack_ftp.h>
@@ -55,6 +54,7 @@ static int nf_nat_ftp_fmt_cmd(enum nf_ct_ftp_type type,
 static unsigned int nf_nat_ftp(struct sk_buff *skb,
                               enum ip_conntrack_info ctinfo,
                               enum nf_ct_ftp_type type,
+                              unsigned int protoff,
                               unsigned int matchoff,
                               unsigned int matchlen,
                               struct nf_conntrack_expect *exp)
@@ -100,7 +100,7 @@ static unsigned int nf_nat_ftp(struct sk_buff *skb,
 
        pr_debug("calling nf_nat_mangle_tcp_packet\n");
 
-       if (!nf_nat_mangle_tcp_packet(skb, ct, ctinfo, matchoff,
+       if (!nf_nat_mangle_tcp_packet(skb, ct, ctinfo, protoff, matchoff,
                                      matchlen, buffer, buflen))
                goto out;