X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=net%2Fipv4%2Fnetfilter%2Fip_conntrack_ftp.c;h=e627e585617237c400d17251b2d2d408072b571c;hb=987b0145d94eecf292d8b301228356f44611ab7c;hp=3e542bf28a9dff7f27093305ddf3f84bdacba04c;hpb=f7ed79d23a47594e7834d66a8f14449796d4f3e6;p=linux-2.6.git

diff --git a/net/ipv4/netfilter/ip_conntrack_ftp.c b/net/ipv4/netfilter/ip_conntrack_ftp.c
index 3e542bf28..e627e5856 100644
--- a/net/ipv4/netfilter/ip_conntrack_ftp.c
+++ b/net/ipv4/netfilter/ip_conntrack_ftp.c
@@ -453,7 +453,7 @@ static struct ip_conntrack_helper ftp[MAX_PORTS];
 static char ftp_names[MAX_PORTS][sizeof("ftp-65535")];
 
 /* Not __exit: called from init() */
-static void ip_conntrack_ftp_fini(void)
+static void fini(void)
 {
 	int i;
 	for (i = 0; i < ports_c; i++) {
@@ -465,7 +465,7 @@ static void ip_conntrack_ftp_fini(void)
 	kfree(ftp_buffer);
 }
 
-static int __init ip_conntrack_ftp_init(void)
+static int __init init(void)
 {
 	int i, ret;
 	char *tmpname;
@@ -499,12 +499,12 @@ static int __init ip_conntrack_ftp_init(void)
 		ret = ip_conntrack_helper_register(&ftp[i]);
 
 		if (ret) {
-			ip_conntrack_ftp_fini();
+			fini();
 			return ret;
 		}
 	}
 	return 0;
 }
 
-module_init(ip_conntrack_ftp_init);
-module_exit(ip_conntrack_ftp_fini);
+module_init(init);
+module_exit(fini);