Merge git://git.linux-nfs.org/pub/linux/nfs-2.6

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

diff --git a/net/ipv4/netfilter/ipt_iprange.c b/net/ipv4/netfilter/ipt_iprange.c
index 33af9e9408875d1aa4d237e9db73a92a5d185bd9..0106dc955a69900ba8593bb9b8ee517c71562983 100644 (file)
--- a/net/ipv4/netfilter/ipt_iprange.c
+++ b/net/ipv4/netfilter/ipt_iprange.c
@@ -17,53 +17,47 @@ MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>");
 MODULE_DESCRIPTION("iptables arbitrary IP range match module");
 
-#if 0
-#define DEBUGP printk
-#else
-#define DEBUGP(format, args...)
-#endif
-
-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)
 {
        const struct ipt_iprange_info *info = matchinfo;
        const struct iphdr *iph = ip_hdr(skb);
 
        if (info->flags & IPRANGE_SRC) {
-               if (((ntohl(iph->saddr) < ntohl(info->src.min_ip))
-                         || (ntohl(iph->saddr) > ntohl(info->src.max_ip)))
+               if ((ntohl(iph->saddr) < ntohl(info->src.min_ip)
+                         || ntohl(iph->saddr) > ntohl(info->src.max_ip))
                         ^ !!(info->flags & IPRANGE_SRC_INV)) {
-                       DEBUGP("src IP %u.%u.%u.%u NOT in range %s"
-                              "%u.%u.%u.%u-%u.%u.%u.%u\n",
-                               NIPQUAD(iph->saddr),
-                               info->flags & IPRANGE_SRC_INV ? "(INV) " : "",
-                               NIPQUAD(info->src.min_ip),
-                               NIPQUAD(info->src.max_ip));
-                       return 0;
+                       pr_debug("src IP %u.%u.%u.%u NOT in range %s"
+                                "%u.%u.%u.%u-%u.%u.%u.%u\n",
+                                NIPQUAD(iph->saddr),
+                                info->flags & IPRANGE_SRC_INV ? "(INV) " : "",
+                                NIPQUAD(info->src.min_ip),
+                                NIPQUAD(info->src.max_ip));
+                       return false;
                }
        }
        if (info->flags & IPRANGE_DST) {
-               if (((ntohl(iph->daddr) < ntohl(info->dst.min_ip))
-                         || (ntohl(iph->daddr) > ntohl(info->dst.max_ip)))
+               if ((ntohl(iph->daddr) < ntohl(info->dst.min_ip)
+                         || ntohl(iph->daddr) > ntohl(info->dst.max_ip))
                         ^ !!(info->flags & IPRANGE_DST_INV)) {
-                       DEBUGP("dst IP %u.%u.%u.%u NOT in range %s"
-                              "%u.%u.%u.%u-%u.%u.%u.%u\n",
-                               NIPQUAD(iph->daddr),
-                               info->flags & IPRANGE_DST_INV ? "(INV) " : "",
-                               NIPQUAD(info->dst.min_ip),
-                               NIPQUAD(info->dst.max_ip));
-                       return 0;
+                       pr_debug("dst IP %u.%u.%u.%u NOT in range %s"
+                                "%u.%u.%u.%u-%u.%u.%u.%u\n",
+                                NIPQUAD(iph->daddr),
+                                info->flags & IPRANGE_DST_INV ? "(INV) " : "",
+                                NIPQUAD(info->dst.min_ip),
+                                NIPQUAD(info->dst.max_ip));
+                       return false;
                }
        }
-       return 1;
+       return true;
 }
 
-static struct xt_match iprange_match = {
+static struct xt_match iprange_match __read_mostly = {
        .name           = "iprange",
        .family         = AF_INET,
        .match          = match,