[NETFILTER]: x_tables: error if ip_conntrack is asked to handle IPv6 packets

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

diff --git a/net/netfilter/xt_state.c b/net/netfilter/xt_state.c
index d9010b16a1f97a4c7e3c5ba604c51c4f1d8e3642..df37b912163a61cd16d40ebcd7f5bf00bd08d6a5 100644 (file)
--- a/net/netfilter/xt_state.c
+++ b/net/netfilter/xt_state.c
@@ -50,22 +50,18 @@ static int check(const char *tablename,
                 void *matchinfo,
                 unsigned int hook_mask)
 {
-#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 "
+               printk(KERN_WARNING "can't load conntrack support for "
                                    "proto=%d\n", match->family);
                return 0;
        }
-#endif
        return 1;
 }
 
 static void
 destroy(const struct xt_match *match, void *matchinfo)
 {
-#if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)
        nf_ct_l3proto_module_put(match->family);
-#endif
 }
 
 static struct xt_match xt_state_match[] = {
@@ -91,7 +87,6 @@ static struct xt_match xt_state_match[] = {
 
 static int __init xt_state_init(void)
 {
-       need_conntrack();
        return xt_register_matches(xt_state_match, ARRAY_SIZE(xt_state_match));
 }