module: neaten __find_symbol, rename to find_symbol

[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..3b021d0c522ab938c6b28c1b8052fddd4e2de49f 100644 (file)
--- a/net/netfilter/xt_quota.c
+++ b/net/netfilter/xt_quota.c
@@ -11,24 +11,26 @@
 
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Sam Johnston <samj@samj.net>");
+MODULE_DESCRIPTION("Xtables: countdown quota match");
 MODULE_ALIAS("ipt_quota");
 MODULE_ALIAS("ip6t_quota");
 
 static DEFINE_SPINLOCK(quota_lock);
 
-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 protoff, int *hotdrop)
+static bool
+quota_mt(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,
+         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,48 +40,48 @@ match(const struct sk_buff *skb,
        return ret;
 }
 
-static int
-checkentry(const char *tablename, const void *entry,
-          const struct xt_match *match, void *matchinfo,
-          unsigned int hook_mask)
+static bool
+quota_mt_check(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 quota_mt_reg[] __read_mostly = {
        {
                .name           = "quota",
                .family         = AF_INET,
-               .checkentry     = checkentry,
-               .match          = match,
+               .checkentry     = quota_mt_check,
+               .match          = quota_mt,
                .matchsize      = sizeof(struct xt_quota_info),
                .me             = THIS_MODULE
        },
        {
                .name           = "quota",
                .family         = AF_INET6,
-               .checkentry     = checkentry,
-               .match          = match,
+               .checkentry     = quota_mt_check,
+               .match          = quota_mt,
                .matchsize      = sizeof(struct xt_quota_info),
                .me             = THIS_MODULE
        },
 };
 
-static int __init xt_quota_init(void)
+static int __init quota_mt_init(void)
 {
-       return xt_register_matches(xt_quota_match, ARRAY_SIZE(xt_quota_match));
+       return xt_register_matches(quota_mt_reg, ARRAY_SIZE(quota_mt_reg));
 }
 
-static void __exit xt_quota_fini(void)
+static void __exit quota_mt_exit(void)
 {
-       xt_unregister_matches(xt_quota_match, ARRAY_SIZE(xt_quota_match));
+       xt_unregister_matches(quota_mt_reg, ARRAY_SIZE(quota_mt_reg));
 }
 
-module_init(xt_quota_init);
-module_exit(xt_quota_fini);
+module_init(quota_mt_init);
+module_exit(quota_mt_exit);