Merge branch 'upstream'

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

diff --git a/net/netfilter/xt_connmark.c b/net/netfilter/xt_connmark.c
index 51822471e919136220e5e8b8349eaeb9ef33ee3f..7b16f1ee16b4a8c78f4b8810e4a78194c2afe150 100644 (file)
--- a/net/netfilter/xt_connmark.c
+++ b/net/netfilter/xt_connmark.c
@@ -64,14 +64,31 @@ checkentry(const char *tablename,
                printk(KERN_WARNING "connmark: only support 32bit mark\n");
                return 0;
        }
+#if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)
+       if (nf_ct_l3proto_try_module_get(match->family) < 0) {
+               printk(KERN_WARNING "can't load nf_conntrack support for "
+                                   "proto=%d\n", match->family);
+               return 0;
+       }
+#endif
        return 1;
 }
 
+static void
+destroy(const struct xt_match *match, void *matchinfo, unsigned int matchsize)
+{
+#if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)
+       nf_ct_l3proto_module_put(match->family);
+#endif
+}
+
 static struct xt_match connmark_match = {
        .name           = "connmark",
        .match          = match,
        .matchsize      = sizeof(struct xt_connmark_info),
        .checkentry     = checkentry,
+       .destroy        = destroy,
+       .family         = AF_INET,
        .me             = THIS_MODULE
 };
 
@@ -80,6 +97,8 @@ static struct xt_match connmark6_match = {
        .match          = match,
        .matchsize      = sizeof(struct xt_connmark_info),
        .checkentry     = checkentry,
+       .destroy        = destroy,
+       .family         = AF_INET6,
        .me             = THIS_MODULE
 };
 
@@ -89,20 +108,20 @@ static int __init init(void)
 
        need_conntrack();
 
-       ret = xt_register_match(AF_INET, &connmark_match);
+       ret = xt_register_match(&connmark_match);
        if (ret)
                return ret;
 
-       ret = xt_register_match(AF_INET6, &connmark6_match);
+       ret = xt_register_match(&connmark6_match);
        if (ret)
-               xt_unregister_match(AF_INET, &connmark_match);
+               xt_unregister_match(&connmark_match);
        return ret;
 }
 
 static void __exit fini(void)
 {
-       xt_unregister_match(AF_INET6, &connmark6_match);
-       xt_unregister_match(AF_INET, &connmark_match);
+       xt_unregister_match(&connmark6_match);
+       xt_unregister_match(&connmark_match);
 }
 
 module_init(init);