Pull battery into release branch

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

diff --git a/net/netfilter/xt_quota.c b/net/netfilter/xt_quota.c
index be8d3c26b56828bc3fb2e580d84dedecbb8e86d0..dae97445b87b498f7e9d770dad26488485d15123 100644 (file)
--- a/net/netfilter/xt_quota.c
+++ b/net/netfilter/xt_quota.c
@@ -16,82 +16,70 @@ MODULE_ALIAS("ip6t_quota");
 
 static DEFINE_SPINLOCK(quota_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_quota_info *q = ((struct xt_quota_info *)matchinfo)->master;
-       int ret = q->flags & XT_QUOTA_INVERT ? 1 : 0;
+       struct xt_quota_info *q =
+               ((const struct xt_quota_info *)matchinfo)->master;
+       bool ret = q->flags & XT_QUOTA_INVERT;
 
        spin_lock_bh(&quota_lock);
        if (q->quota >= skb->len) {
                q->quota -= skb->len;
-               ret ^= 1;
+               ret = !ret;
        } else {
-               /* we do not allow even small packets from now on */
-               q->quota = 0;
+               /* we do not allow even small packets from now on */
+               q->quota = 0;
        }
        spin_unlock_bh(&quota_lock);
 
        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_quota_info *q = (struct xt_quota_info *)matchinfo;
+       struct xt_quota_info *q = matchinfo;
 
        if (q->flags & ~XT_QUOTA_MASK)
-               return 0;
+               return false;
        /* For SMP, we only want to use one set of counters. */
        q->master = q;
-       return 1;
+       return true;
 }
 
-static struct xt_match quota_match = {
-       .name           = "quota",
-       .family         = AF_INET,
-       .match          = match,
-       .matchsize      = sizeof(struct xt_quota_info),
-       .checkentry     = checkentry,
-       .me             = THIS_MODULE
-};
-
-static struct xt_match quota_match6 = {
-       .name           = "quota",
-       .family         = AF_INET6,
-       .match          = match,
-       .matchsize      = sizeof(struct xt_quota_info),
-       .checkentry     = checkentry,
-       .me             = THIS_MODULE
+static struct xt_match xt_quota_match[] __read_mostly = {
+       {
+               .name           = "quota",
+               .family         = AF_INET,
+               .checkentry     = checkentry,
+               .match          = match,
+               .matchsize      = sizeof(struct xt_quota_info),
+               .me             = THIS_MODULE
+       },
+       {
+               .name           = "quota",
+               .family         = AF_INET6,
+               .checkentry     = checkentry,
+               .match          = match,
+               .matchsize      = sizeof(struct xt_quota_info),
+               .me             = THIS_MODULE
+       },
 };
 
 static int __init xt_quota_init(void)
 {
-       int ret;
-
-       ret = xt_register_match(&quota_match);
-       if (ret)
-               goto err1;
-       ret = xt_register_match(&quota_match6);
-       if (ret)
-               goto err2;
-       return ret;
-
-err2:
-       xt_unregister_match(&quota_match);
-err1:
-       return ret;
+       return xt_register_matches(xt_quota_match, ARRAY_SIZE(xt_quota_match));
 }
 
 static void __exit xt_quota_fini(void)
 {
-       xt_unregister_match(&quota_match6);
-       xt_unregister_match(&quota_match);
+       xt_unregister_matches(xt_quota_match, ARRAY_SIZE(xt_quota_match));
 }
 
 module_init(xt_quota_init);