linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / net / netfilter / xt_conntrack.c

diff --git a/net/netfilter/xt_conntrack.c b/net/netfilter/xt_conntrack.c
index 145489a..ffdebc9 100644 (file)
--- a/net/netfilter/xt_conntrack.c
+++ b/net/netfilter/xt_conntrack.c
@@ -32,7 +32,6 @@ static int
 match(const struct sk_buff *skb,
       const struct net_device *in,
       const struct net_device *out,
-      const struct xt_match *match,
       const void *matchinfo,
       int offset,
       unsigned int protoff,
@@ -119,7 +118,6 @@ static int
 match(const struct sk_buff *skb,
       const struct net_device *in,
       const struct net_device *out,
-      const struct xt_match *match,
       const void *matchinfo,
       int offset,
       unsigned int protoff,
@@ -203,55 +201,38 @@ match(const struct sk_buff *skb,
 
 #endif /* CONFIG_NF_IP_CONNTRACK */
 
-static int
-checkentry(const char *tablename,
-          const void *ip,
-          const struct xt_match *match,
-          void *matchinfo,
-          unsigned int matchsize,
-          unsigned int hook_mask)
+static int check(const char *tablename,
+                const void *ip,
+                void *matchinfo,
+                unsigned int matchsize,
+                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 "
-                                   "proto=%d\n", match->family);
+       if (matchsize != XT_ALIGN(sizeof(struct xt_conntrack_info)))
                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
+       return 1;
 }
 
 static struct xt_match conntrack_match = {
        .name           = "conntrack",
-       .match          = match,
-       .checkentry     = checkentry,
-       .destroy        = destroy,
-       .matchsize      = sizeof(struct xt_conntrack_info),
-       .family         = AF_INET,
+       .match          = &match,
+       .checkentry     = &check,
        .me             = THIS_MODULE,
 };
 
-static int __init xt_conntrack_init(void)
+static int __init init(void)
 {
        int ret;
        need_conntrack();
-       ret = xt_register_match(&conntrack_match);
+       ret = xt_register_match(AF_INET, &conntrack_match);
 
        return ret;
 }
 
-static void __exit xt_conntrack_fini(void)
+static void __exit fini(void)
 {
-       xt_unregister_match(&conntrack_match);
+       xt_unregister_match(AF_INET, &conntrack_match);
 }
 
-module_init(xt_conntrack_init);
-module_exit(xt_conntrack_fini);
+module_init(init);
+module_exit(fini);