X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=net%2Fnetfilter%2Fxt_comment.c;fp=net%2Fnetfilter%2Fxt_comment.c;h=4ba6fd65c6e9319a6be5b4eb321cd6a600e72f3b;hb=64ba3f394c830ec48a1c31b53dcae312c56f1604;hp=197609cb06d7e6cb6249d291aeb06abc00abec75;hpb=be1e6109ac94a859551f8e1774eb9a8469fe055c;p=linux-2.6.git

diff --git a/net/netfilter/xt_comment.c b/net/netfilter/xt_comment.c
index 197609cb0..4ba6fd65c 100644
--- a/net/netfilter/xt_comment.c
+++ b/net/netfilter/xt_comment.c
@@ -19,7 +19,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 protooff,
@@ -29,42 +28,53 @@ match(const struct sk_buff *skb,
 	return 1;
 }
 
+static int
+checkentry(const char *tablename,
+           const void *ip,
+           void *matchinfo,
+           unsigned int matchsize,
+           unsigned int hook_mask)
+{
+	/* Check the size */
+	if (matchsize != XT_ALIGN(sizeof(struct xt_comment_info)))
+		return 0;
+	return 1;
+}
+
 static struct xt_match comment_match = {
 	.name		= "comment",
 	.match		= match,
-	.matchsize	= sizeof(struct xt_comment_info),
-	.family		= AF_INET,
+	.checkentry	= checkentry,
 	.me		= THIS_MODULE
 };
 
 static struct xt_match comment6_match = {
 	.name		= "comment",
 	.match		= match,
-	.matchsize	= sizeof(struct xt_comment_info),
-	.family		= AF_INET6,
+	.checkentry	= checkentry,
 	.me		= THIS_MODULE
 };
 
-static int __init xt_comment_init(void)
+static int __init init(void)
 {
 	int ret;
 
-	ret = xt_register_match(&comment_match);
+	ret = xt_register_match(AF_INET, &comment_match);
 	if (ret)
 		return ret;
 
-	ret = xt_register_match(&comment6_match);
+	ret = xt_register_match(AF_INET6, &comment6_match);
 	if (ret)
-		xt_unregister_match(&comment_match);
+		xt_unregister_match(AF_INET, &comment_match);
 
 	return ret;
 }
 
-static void __exit xt_comment_fini(void)
+static void __exit fini(void)
 {
-	xt_unregister_match(&comment_match);
-	xt_unregister_match(&comment6_match);
+	xt_unregister_match(AF_INET, &comment_match);
+	xt_unregister_match(AF_INET6, &comment6_match);
 }
 
-module_init(xt_comment_init);
-module_exit(xt_comment_fini);
+module_init(init);
+module_exit(fini);