fedora core 6 1.2949 + vserver 2.2.0

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

diff --git a/net/netfilter/xt_comment.c b/net/netfilter/xt_comment.c
index 4ba6fd6..7db492d 100644 (file)
--- a/net/netfilter/xt_comment.c
+++ b/net/netfilter/xt_comment.c
@@ -19,6 +19,7 @@ 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,
@@ -28,53 +29,33 @@ 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,
-       .checkentry     = checkentry,
-       .me             = THIS_MODULE
+static struct xt_match xt_comment_match[] = {
+       {
+               .name           = "comment",
+               .family         = AF_INET,
+               .match          = match,
+               .matchsize      = sizeof(struct xt_comment_info),
+               .me             = THIS_MODULE
+       },
+       {
+               .name           = "comment",
+               .family         = AF_INET6,
+               .match          = match,
+               .matchsize      = sizeof(struct xt_comment_info),
+               .me             = THIS_MODULE
+       },
 };
 
-static struct xt_match comment6_match = {
-       .name           = "comment",
-       .match          = match,
-       .checkentry     = checkentry,
-       .me             = THIS_MODULE
-};
-
-static int __init init(void)
+static int __init xt_comment_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_matches(xt_comment_match,
+                                  ARRAY_SIZE(xt_comment_match));
 }
 
-static void __exit fini(void)
+static void __exit xt_comment_fini(void)
 {
-       xt_unregister_match(AF_INET, &comment_match);
-       xt_unregister_match(AF_INET6, &comment6_match);
+       xt_unregister_matches(xt_comment_match, ARRAY_SIZE(xt_comment_match));
 }
 
-module_init(init);
-module_exit(fini);
+module_init(xt_comment_init);
+module_exit(xt_comment_fini);