Merge git://git.linux-xtensa.org/kernel/xtensa-feed

[sfrench/cifs-2.6.git] / net / netfilter / xt_string.c

diff --git a/net/netfilter/xt_string.c b/net/netfilter/xt_string.c
index 275330fcdaaab9dfebba281e3baf5e80671c884c..999a005dbd0cb5c73c0285f3241b03794f7a9418 100644 (file)
--- a/net/netfilter/xt_string.c
+++ b/net/netfilter/xt_string.c
@@ -1,5 +1,5 @@
 /* String matching match for iptables
- * 
+ *
  * (C) 2005 Pablo Neira Ayuso <pablo@eurodev.net>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -35,8 +35,8 @@ static int match(const struct sk_buff *skb,
 
        memset(&state, 0, sizeof(struct ts_state));
 
-       return (skb_find_text((struct sk_buff *)skb, conf->from_offset, 
-                            conf->to_offset, conf->config, &state) 
+       return (skb_find_text((struct sk_buff *)skb, conf->from_offset,
+                            conf->to_offset, conf->config, &state)
                             != UINT_MAX) ^ conf->invert;
 }
 
@@ -46,7 +46,6 @@ static int checkentry(const char *tablename,
                      const void *ip,
                      const struct xt_match *match,
                      void *matchinfo,
-                     unsigned int matchsize,
                      unsigned int hook_mask)
 {
        struct xt_string_info *conf = matchinfo;
@@ -56,7 +55,7 @@ static int checkentry(const char *tablename,
        if (conf->from_offset > conf->to_offset)
                return 0;
        if (conf->algo[XT_STRING_MAX_ALGO_NAME_SIZE - 1] != '\0')
-               return 0;
+               return 0;
        if (conf->patlen > XT_STRING_MAX_PATTERN_SIZE)
                return 0;
        ts_conf = textsearch_prepare(conf->algo, conf->pattern, conf->patlen,
@@ -69,49 +68,40 @@ static int checkentry(const char *tablename,
        return 1;
 }
 
-static void destroy(const struct xt_match *match, void *matchinfo,
-                   unsigned int matchsize)
+static void destroy(const struct xt_match *match, void *matchinfo)
 {
        textsearch_destroy(STRING_TEXT_PRIV(matchinfo)->config);
 }
 
-static struct xt_match string_match = {
-       .name           = "string",
-       .match          = match,
-       .matchsize      = sizeof(struct xt_string_info),
-       .checkentry     = checkentry,
-       .destroy        = destroy,
-       .family         = AF_INET,
-       .me             = THIS_MODULE
-};
-static struct xt_match string6_match = {
-       .name           = "string",
-       .match          = match,
-       .matchsize      = sizeof(struct xt_string_info),
-       .checkentry     = checkentry,
-       .destroy        = destroy,
-       .family         = AF_INET6,
-       .me             = THIS_MODULE
+static struct xt_match xt_string_match[] = {
+       {
+               .name           = "string",
+               .family         = AF_INET,
+               .checkentry     = checkentry,
+               .match          = match,
+               .destroy        = destroy,
+               .matchsize      = sizeof(struct xt_string_info),
+               .me             = THIS_MODULE
+       },
+       {
+               .name           = "string",
+               .family         = AF_INET6,
+               .checkentry     = checkentry,
+               .match          = match,
+               .destroy        = destroy,
+               .matchsize      = sizeof(struct xt_string_info),
+               .me             = THIS_MODULE
+       },
 };
 
 static int __init xt_string_init(void)
 {
-       int ret;
-
-       ret = xt_register_match(&string_match);
-       if (ret)
-               return ret;
-       ret = xt_register_match(&string6_match);
-       if (ret)
-               xt_unregister_match(&string_match);
-
-       return ret;
+       return xt_register_matches(xt_string_match, ARRAY_SIZE(xt_string_match));
 }
 
 static void __exit xt_string_fini(void)
 {
-       xt_unregister_match(&string_match);
-       xt_unregister_match(&string6_match);
+       xt_unregister_matches(xt_string_match, ARRAY_SIZE(xt_string_match));
 }
 
 module_init(xt_string_init);