Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy...

[linux-2.6-omap-h63xx.git] / net / netfilter / xt_tcpudp.c

diff --git a/net/netfilter/xt_tcpudp.c b/net/netfilter/xt_tcpudp.c
index 14a990eb666ae2a7496d91b745d698a1c49be7b4..a9a63aa6893692a774b52c1cae9441262c2c1602 100644 (file)
--- a/net/netfilter/xt_tcpudp.c
+++ b/net/netfilter/xt_tcpudp.c
@@ -238,7 +238,7 @@ static struct xt_match udp6_matchstruct = {
        .me             = THIS_MODULE,
 };
 
-static int __init init(void)
+static int __init xt_tcpudp_init(void)
 {
        int ret;
        ret = xt_register_match(&tcp_matchstruct);
@@ -260,7 +260,7 @@ static int __init init(void)
        return ret;
 
 out_unreg_udp:
-       xt_unregister_match(&tcp_matchstruct);
+       xt_unregister_match(&udp_matchstruct);
 out_unreg_tcp6:
        xt_unregister_match(&tcp6_matchstruct);
 out_unreg_tcp:
@@ -268,7 +268,7 @@ out_unreg_tcp:
        return ret;
 }
 
-static void __exit fini(void)
+static void __exit xt_tcpudp_fini(void)
 {
        xt_unregister_match(&udp6_matchstruct);
        xt_unregister_match(&udp_matchstruct);
@@ -276,5 +276,5 @@ static void __exit fini(void)
        xt_unregister_match(&tcp_matchstruct);
 }
 
-module_init(init);
-module_exit(fini);
+module_init(xt_tcpudp_init);
+module_exit(xt_tcpudp_fini);