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

[linux-2.6] / net / netfilter / xt_mark.c

diff --git a/net/netfilter/xt_mark.c b/net/netfilter/xt_mark.c
index c1a8f0f587f03ea18c515a1b4dde1e16b02583c6..8b385a34886de4fdbf9c324377dc1348a20e815c 100644 (file)
--- a/net/netfilter/xt_mark.c
+++ b/net/netfilter/xt_mark.c
@@ -56,6 +56,7 @@ static struct xt_match mark_match = {
        .match          = match,
        .matchsize      = sizeof(struct xt_mark_info),
        .checkentry     = checkentry,
+       .family         = AF_INET,
        .me             = THIS_MODULE,
 };
 
@@ -64,28 +65,29 @@ static struct xt_match mark6_match = {
        .match          = match,
        .matchsize      = sizeof(struct xt_mark_info),
        .checkentry     = checkentry,
+       .family         = AF_INET6,
        .me             = THIS_MODULE,
 };
 
-static int __init init(void)
+static int __init xt_mark_init(void)
 {
        int ret;
-       ret = xt_register_match(AF_INET, &mark_match);
+       ret = xt_register_match(&mark_match);
        if (ret)
                return ret;
 
-       ret = xt_register_match(AF_INET6, &mark6_match);
+       ret = xt_register_match(&mark6_match);
        if (ret)
-               xt_unregister_match(AF_INET, &mark_match);
+               xt_unregister_match(&mark_match);
 
        return ret;
 }
 
-static void __exit fini(void)
+static void __exit xt_mark_fini(void)
 {
-       xt_unregister_match(AF_INET, &mark_match);
-       xt_unregister_match(AF_INET6, &mark6_match);
+       xt_unregister_match(&mark_match);
+       xt_unregister_match(&mark6_match);
 }
 
-module_init(init);
-module_exit(fini);
+module_init(xt_mark_init);
+module_exit(xt_mark_fini);