ocfs2: abstract out allocation locking

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

diff --git a/net/netfilter/xt_realm.c b/net/netfilter/xt_realm.c
index 57815a07db678f10deb558e5fc822cb9cde790d9..97ffc2fbc19d907a5f3fedc1f056d8714c51404f 100644 (file)
--- a/net/netfilter/xt_realm.c
+++ b/net/netfilter/xt_realm.c
@@ -35,7 +35,7 @@ match(const struct sk_buff *skb,
 {
        const struct xt_realm_info *info = matchinfo;
        struct dst_entry *dst = skb->dst;
-    
+
        return (info->id == (dst->tclassid & info->mask)) ^ info->invert;
 }
 
@@ -45,18 +45,19 @@ static struct xt_match realm_match = {
        .matchsize      = sizeof(struct xt_realm_info),
        .hooks          = (1 << NF_IP_POST_ROUTING) | (1 << NF_IP_FORWARD) |
                          (1 << NF_IP_LOCAL_OUT) | (1 << NF_IP_LOCAL_IN),
+       .family         = AF_INET,
        .me             = THIS_MODULE
 };
 
-static int __init init(void)
+static int __init xt_realm_init(void)
 {
-       return xt_register_match(AF_INET, &realm_match);
+       return xt_register_match(&realm_match);
 }
 
-static void __exit fini(void)
+static void __exit xt_realm_fini(void)
 {
-       xt_unregister_match(AF_INET, &realm_match);
+       xt_unregister_match(&realm_match);
 }
 
-module_init(init);
-module_exit(fini);
+module_init(xt_realm_init);
+module_exit(xt_realm_fini);