Pull battery into release branch

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

diff --git a/net/netfilter/xt_dscp.c b/net/netfilter/xt_dscp.c
index c9c6518907a220c5cb31ca7760b3b05e94a8252e..dde6d66e0d338aef43cb80d85afd0b6e6ca62376 100644 (file)
--- a/net/netfilter/xt_dscp.c
+++ b/net/netfilter/xt_dscp.c
@@ -52,23 +52,23 @@ static bool match6(const struct sk_buff *skb,
        return (dscp == info->dscp) ^ !!info->invert;
 }
 
-static int checkentry(const char *tablename,
-                     const void *info,
-                     const struct xt_match *match,
-                     void *matchinfo,
-                     unsigned int hook_mask)
+static bool checkentry(const char *tablename,
+                      const void *info,
+                      const struct xt_match *match,
+                      void *matchinfo,
+                      unsigned int hook_mask)
 {
        const u_int8_t dscp = ((struct xt_dscp_info *)matchinfo)->dscp;
 
        if (dscp > XT_DSCP_MAX) {
                printk(KERN_ERR "xt_dscp: dscp %x out of range\n", dscp);
-               return 0;
+               return false;
        }
 
-       return 1;
+       return true;
 }
 
-static struct xt_match xt_dscp_match[] = {
+static struct xt_match xt_dscp_match[] __read_mostly = {
        {
                .name           = "dscp",
                .family         = AF_INET,