linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / net / netfilter / nf_conntrack_ftp.c

diff --git a/net/netfilter/nf_conntrack_ftp.c b/net/netfilter/nf_conntrack_ftp.c
index e38a4b5..6f210f3 100644 (file)
--- a/net/netfilter/nf_conntrack_ftp.c
+++ b/net/netfilter/nf_conntrack_ftp.c
@@ -440,7 +440,7 @@ static int help(struct sk_buff **pskb,
        u32 seq;
        int dir = CTINFO2DIR(ctinfo);
        unsigned int matchlen, matchoff;
-       struct ip_ct_ftp_master *ct_ftp_info = &nfct_help(ct)->help.ct_ftp_info;
+       struct ip_ct_ftp_master *ct_ftp_info = &ct->help->ct_ftp_info;
        struct nf_conntrack_expect *exp;
        struct nf_conntrack_man cmd = {};
 
@@ -624,7 +624,7 @@ static struct nf_conntrack_helper ftp[MAX_PORTS][2];
 static char ftp_names[MAX_PORTS][2][sizeof("ftp-65535")];
 
 /* don't make this __exit, since it's called from __init ! */
-static void nf_conntrack_ftp_fini(void)
+static void fini(void)
 {
        int i, j;
        for (i = 0; i < ports_c; i++) {
@@ -642,7 +642,7 @@ static void nf_conntrack_ftp_fini(void)
        kfree(ftp_buffer);
 }
 
-static int __init nf_conntrack_ftp_init(void)
+static int __init init(void)
 {
        int i, j = -1, ret = 0;
        char *tmpname;
@@ -683,7 +683,7 @@ static int __init nf_conntrack_ftp_init(void)
                                printk("nf_ct_ftp: failed to register helper "
                                       " for pf: %d port: %d\n",
                                        ftp[i][j].tuple.src.l3num, ports[i]);
-                               nf_conntrack_ftp_fini();
+                               fini();
                                return ret;
                        }
                }
@@ -692,5 +692,5 @@ static int __init nf_conntrack_ftp_init(void)
        return 0;
 }
 
-module_init(nf_conntrack_ftp_init);
-module_exit(nf_conntrack_ftp_fini);
+module_init(init);
+module_exit(fini);