[NETFILTER]: x_tables: switch xt_match->checkentry to bool

[linux-2.6-omap-h63xx.git] / net / netfilter / xt_statistic.c

diff --git a/net/netfilter/xt_statistic.c b/net/netfilter/xt_statistic.c
index de1037f58596d3268e9ec4c7387b4787938d6b27..0af42892e9dca53172d54b0deb0378298fd82ee7 100644 (file)
--- a/net/netfilter/xt_statistic.c
+++ b/net/netfilter/xt_statistic.c
@@ -24,26 +24,26 @@ MODULE_ALIAS("ip6t_statistic");
 
 static DEFINE_SPINLOCK(nth_lock);
 
-static int
+static bool
 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 protoff, int *hotdrop)
+      int offset, unsigned int protoff, bool *hotdrop)
 {
        struct xt_statistic_info *info = (struct xt_statistic_info *)matchinfo;
-       int ret = info->flags & XT_STATISTIC_INVERT ? 1 : 0;
+       bool ret = info->flags & XT_STATISTIC_INVERT;
 
        switch (info->mode) {
        case XT_STATISTIC_MODE_RANDOM:
                if ((net_random() & 0x7FFFFFFF) < info->u.random.probability)
-                       ret ^= 1;
+                       ret = !ret;
                break;
        case XT_STATISTIC_MODE_NTH:
                info = info->master;
                spin_lock_bh(&nth_lock);
                if (info->u.nth.count++ == info->u.nth.every) {
                        info->u.nth.count = 0;
-                       ret ^= 1;
+                       ret = !ret;
                }
                spin_unlock_bh(&nth_lock);
                break;
@@ -52,60 +52,49 @@ match(const struct sk_buff *skb,
        return ret;
 }
 
-static int
+static bool
 checkentry(const char *tablename, const void *entry,
           const struct xt_match *match, void *matchinfo,
-          unsigned int matchsize, unsigned int hook_mask)
+          unsigned int hook_mask)
 {
        struct xt_statistic_info *info = (struct xt_statistic_info *)matchinfo;
 
        if (info->mode > XT_STATISTIC_MODE_MAX ||
            info->flags & ~XT_STATISTIC_MASK)
-               return 0;
+               return false;
        info->master = info;
-       return 1;
+       return true;
 }
 
-static struct xt_match statistic_match = {
-       .name           = "statistic",
-       .match          = match,
-       .matchsize      = sizeof(struct xt_statistic_info),
-       .checkentry     = checkentry,
-       .family         = AF_INET,
-       .me             = THIS_MODULE,
-};
-
-static struct xt_match statistic_match6 = {
-       .name           = "statistic",
-       .match          = match,
-       .matchsize      = sizeof(struct xt_statistic_info),
-       .checkentry     = checkentry,
-       .family         = AF_INET6,
-       .me             = THIS_MODULE,
+static struct xt_match xt_statistic_match[] = {
+       {
+               .name           = "statistic",
+               .family         = AF_INET,
+               .checkentry     = checkentry,
+               .match          = match,
+               .matchsize      = sizeof(struct xt_statistic_info),
+               .me             = THIS_MODULE,
+       },
+       {
+               .name           = "statistic",
+               .family         = AF_INET6,
+               .checkentry     = checkentry,
+               .match          = match,
+               .matchsize      = sizeof(struct xt_statistic_info),
+               .me             = THIS_MODULE,
+       },
 };
 
 static int __init xt_statistic_init(void)
 {
-       int ret;
-
-       ret = xt_register_match(&statistic_match);
-       if (ret)
-               goto err1;
-
-       ret = xt_register_match(&statistic_match6);
-       if (ret)
-               goto err2;
-       return ret;
-err2:
-       xt_unregister_match(&statistic_match);
-err1:
-       return ret;
+       return xt_register_matches(xt_statistic_match,
+                                  ARRAY_SIZE(xt_statistic_match));
 }
 
 static void __exit xt_statistic_fini(void)
 {
-       xt_unregister_match(&statistic_match6);
-       xt_unregister_match(&statistic_match);
+       xt_unregister_matches(xt_statistic_match,
+                             ARRAY_SIZE(xt_statistic_match));
 }
 
 module_init(xt_statistic_init);