X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=net%2Fnetfilter%2Fxt_state.c;fp=net%2Fnetfilter%2Fxt_state.c;h=39ce808d40ef7b834daeb598e3a9935d23e55f12;hb=64ba3f394c830ec48a1c31b53dcae312c56f1604;hp=f9e304dc4504e6e3c201c2d70e370f516a56f744;hpb=be1e6109ac94a859551f8e1774eb9a8469fe055c;p=linux-2.6.git

diff --git a/net/netfilter/xt_state.c b/net/netfilter/xt_state.c
index f9e304dc4..39ce808d4 100644
--- a/net/netfilter/xt_state.c
+++ b/net/netfilter/xt_state.c
@@ -24,7 +24,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,
@@ -45,72 +44,53 @@ match(const struct sk_buff *skb,
 }
 
 static int check(const char *tablename,
-		 const void *inf,
-		 const struct xt_match *match,
+		 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_state_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 state_match = {
 	.name		= "state",
-	.match		= match,
-	.checkentry	= check,
-	.destroy	= destroy,
-	.matchsize	= sizeof(struct xt_state_info),
-	.family		= AF_INET,
+	.match		= &match,
+	.checkentry	= &check,
 	.me		= THIS_MODULE,
 };
 
 static struct xt_match state6_match = {
 	.name		= "state",
-	.match		= match,
-	.checkentry	= check,
-	.destroy	= destroy,
-	.matchsize	= sizeof(struct xt_state_info),
-	.family		= AF_INET6,
+	.match		= &match,
+	.checkentry	= &check,
 	.me		= THIS_MODULE,
 };
 
-static int __init xt_state_init(void)
+static int __init init(void)
 {
 	int ret;
 
 	need_conntrack();
 
-	ret = xt_register_match(&state_match);
+	ret = xt_register_match(AF_INET, &state_match);
 	if (ret < 0)
 		return ret;
 
-	ret = xt_register_match(&state6_match);
+	ret = xt_register_match(AF_INET6, &state6_match);
 	if (ret < 0)
-		xt_unregister_match(&state_match);
+		xt_unregister_match(AF_INET,&state_match);
 
 	return ret;
 }
 
-static void __exit xt_state_fini(void)
+static void __exit fini(void)
 {
-	xt_unregister_match(&state_match);
-	xt_unregister_match(&state6_match);
+	xt_unregister_match(AF_INET, &state_match);
+	xt_unregister_match(AF_INET6, &state6_match);
 }
 
-module_init(xt_state_init);
-module_exit(xt_state_fini);
+module_init(init);
+module_exit(fini);