1 files changed, 17 insertions, 52 deletions
diff --git a/net/netfilter/xt_comment.c b/net/netfilter/xt_comment.c
index 4ba6fd65c6e..5c861d2f21c 100644
--- a/net/netfilter/xt_comment.c
+++ b/net/netfilter/xt_comment.c
@@ -10,71 +10,36 @@
 #include <linux/netfilter/xt_comment.h>
 
 MODULE_AUTHOR("Brad Fisher <brad@info-link.net>");
-MODULE_DESCRIPTION("iptables comment match module");
+MODULE_DESCRIPTION("Xtables: No-op match which can be tagged with a comment");
 MODULE_LICENSE("GPL");
 MODULE_ALIAS("ipt_comment");
 MODULE_ALIAS("ip6t_comment");
 
-static int
-match(const struct sk_buff *skb,
-      const struct net_device *in,
-      const struct net_device *out,
-      const void *matchinfo,
-      int offset,
-      unsigned int protooff,
-      int *hotdrop)
+static bool
+comment_mt(const struct sk_buff *skb, struct xt_action_param *par)
 {
 	/* We always match */
-	return 1;
+	return true;
 }
 
-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,
-	.checkentry	= checkentry,
-	.me		= THIS_MODULE
-};
-
-static struct xt_match comment6_match = {
-	.name		= "comment",
-	.match		= match,
-	.checkentry	= checkentry,
-	.me		= THIS_MODULE
+static struct xt_match comment_mt_reg __read_mostly = {
+	.name      = "comment",
+	.revision  = 0,
+	.family    = NFPROTO_UNSPEC,
+	.match     = comment_mt,
+	.matchsize = sizeof(struct xt_comment_info),
+	.me        = THIS_MODULE,
 };
 
-static int __init init(void)
+static int __init comment_mt_init(void)
 {
-	int ret;
-
-	ret = xt_register_match(AF_INET, &comment_match);
-	if (ret)
-		return ret;
-
-	ret = xt_register_match(AF_INET6, &comment6_match);
-	if (ret)
-		xt_unregister_match(AF_INET, &comment_match);
-
-	return ret;
+	return xt_register_match(&comment_mt_reg);
 }
 
-static void __exit fini(void)
+static void __exit comment_mt_exit(void)
 {
-	xt_unregister_match(AF_INET, &comment_match);
-	xt_unregister_match(AF_INET6, &comment6_match);
+	xt_unregister_match(&comment_mt_reg);
 }
 
-module_init(init);
-module_exit(fini);
+module_init(comment_mt_init);
+module_exit(comment_mt_exit);