Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc

[linux-2.6] / net / ipv4 / netfilter / ipt_ttl.c

diff --git a/net/ipv4/netfilter/ipt_ttl.c b/net/ipv4/netfilter/ipt_ttl.c
index 82fe4ea8ab791534a819356c87d7eb086d26b897..a439900a4ba5caa5066946aea2fff7350fde60f0 100644 (file)
--- a/net/ipv4/netfilter/ipt_ttl.c
+++ b/net/ipv4/netfilter/ipt_ttl.c
@@ -28,17 +28,13 @@ static bool match(const struct sk_buff *skb,
 
        switch (info->mode) {
                case IPT_TTL_EQ:
-                       return (ttl == info->ttl);
-                       break;
+                       return ttl == info->ttl;
                case IPT_TTL_NE:
-                       return (!(ttl == info->ttl));
-                       break;
+                       return ttl != info->ttl;
                case IPT_TTL_LT:
-                       return (ttl < info->ttl);
-                       break;
+                       return ttl < info->ttl;
                case IPT_TTL_GT:
-                       return (ttl > info->ttl);
-                       break;
+                       return ttl > info->ttl;
                default:
                        printk(KERN_WARNING "ipt_ttl: unknown mode %d\n",
                                info->mode);
@@ -48,7 +44,7 @@ static bool match(const struct sk_buff *skb,
        return false;
 }
 
-static struct xt_match ttl_match = {
+static struct xt_match ttl_match __read_mostly = {
        .name           = "ttl",
        .family         = AF_INET,
        .match          = match,