Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

[pandora-kernel.git] / net / netfilter / xt_comment.c

diff --git a/net/netfilter/xt_comment.c b/net/netfilter/xt_comment.c
index 197609c..89f4736 100644 (file)
--- a/net/netfilter/xt_comment.c
+++ b/net/netfilter/xt_comment.c
@@ -10,61 +10,47 @@
 #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 struct xt_match *match,
-      const void *matchinfo,
-      int offset,
-      unsigned int protooff,
-      int *hotdrop)
+static bool
+comment_mt(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,
+           bool *hotdrop)
 {
        /* We always match */
-       return 1;
+       return true;
 }
 
-static struct xt_match comment_match = {
-       .name           = "comment",
-       .match          = match,
-       .matchsize      = sizeof(struct xt_comment_info),
-       .family         = AF_INET,
-       .me             = THIS_MODULE
+static struct xt_match comment_mt_reg[] __read_mostly = {
+       {
+               .name           = "comment",
+               .family         = AF_INET,
+               .match          = comment_mt,
+               .matchsize      = sizeof(struct xt_comment_info),
+               .me             = THIS_MODULE
+       },
+       {
+               .name           = "comment",
+               .family         = AF_INET6,
+               .match          = comment_mt,
+               .matchsize      = sizeof(struct xt_comment_info),
+               .me             = THIS_MODULE
+       },
 };
 
-static struct xt_match comment6_match = {
-       .name           = "comment",
-       .match          = match,
-       .matchsize      = sizeof(struct xt_comment_info),
-       .family         = AF_INET6,
-       .me             = THIS_MODULE
-};
-
-static int __init xt_comment_init(void)
+static int __init comment_mt_init(void)
 {
-       int ret;
-
-       ret = xt_register_match(&comment_match);
-       if (ret)
-               return ret;
-
-       ret = xt_register_match(&comment6_match);
-       if (ret)
-               xt_unregister_match(&comment_match);
-
-       return ret;
+       return xt_register_matches(comment_mt_reg, ARRAY_SIZE(comment_mt_reg));
 }
 
-static void __exit xt_comment_fini(void)
+static void __exit comment_mt_exit(void)
 {
-       xt_unregister_match(&comment_match);
-       xt_unregister_match(&comment6_match);
+       xt_unregister_matches(comment_mt_reg, ARRAY_SIZE(comment_mt_reg));
 }
 
-module_init(xt_comment_init);
-module_exit(xt_comment_fini);
+module_init(comment_mt_init);
+module_exit(comment_mt_exit);