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 bfdde06ca0b7dfe5ceec4fab5368e577543b0645..dae97445b87b498f7e9d770dad26488485d15123 100644 (file)
--- a/net/netfilter/xt_quota.c
+++ b/net/netfilter/xt_quota.c
@@ -16,19 +16,20 @@ 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;
@@ -38,21 +39,21 @@ 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 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 xt_quota_match[] = {
+static struct xt_match xt_quota_match[] __read_mostly = {
        {
                .name           = "quota",
                .family         = AF_INET,