Pull misc into release branch

[pandora-kernel.git] / net / netfilter / xt_multiport.c

diff --git a/net/netfilter/xt_multiport.c b/net/netfilter/xt_multiport.c
index 1602086..e8ae102 100644 (file)
--- a/net/netfilter/xt_multiport.c
+++ b/net/netfilter/xt_multiport.c
@@ -33,24 +33,24 @@ MODULE_ALIAS("ip6t_multiport");
 #endif
 
 /* Returns 1 if the port is matched by the test, 0 otherwise. */
-static inline int
+static inline bool
 ports_match(const u_int16_t *portlist, enum xt_multiport_flags flags,
            u_int8_t count, u_int16_t src, u_int16_t dst)
 {
        unsigned int i;
        for (i = 0; i < count; i++) {
                if (flags != XT_MULTIPORT_DESTINATION && portlist[i] == src)
-                       return 1;
+                       return true;
 
                if (flags != XT_MULTIPORT_SOURCE && portlist[i] == dst)
-                       return 1;
+                       return true;
        }
 
-       return 0;
+       return false;
 }
 
 /* Returns 1 if the port is matched by the test, 0 otherwise. */
-static inline int
+static inline bool
 ports_match_v1(const struct xt_multiport_v1 *minfo,
               u_int16_t src, u_int16_t dst)
 {
@@ -67,34 +67,34 @@ ports_match_v1(const struct xt_multiport_v1 *minfo,
 
                        if (minfo->flags == XT_MULTIPORT_SOURCE
                            && src >= s && src <= e)
-                               return 1 ^ minfo->invert;
+                               return true ^ minfo->invert;
                        if (minfo->flags == XT_MULTIPORT_DESTINATION
                            && dst >= s && dst <= e)
-                               return 1 ^ minfo->invert;
+                               return true ^ minfo->invert;
                        if (minfo->flags == XT_MULTIPORT_EITHER
                            && ((dst >= s && dst <= e)
                                || (src >= s && src <= e)))
-                               return 1 ^ minfo->invert;
+                               return true ^ minfo->invert;
                } else {
                        /* exact port matching */
                        duprintf("src or dst matches with %d?\n", s);
 
                        if (minfo->flags == XT_MULTIPORT_SOURCE
                            && src == s)
-                               return 1 ^ minfo->invert;
+                               return true ^ minfo->invert;
                        if (minfo->flags == XT_MULTIPORT_DESTINATION
                            && dst == s)
-                               return 1 ^ minfo->invert;
+                               return true ^ minfo->invert;
                        if (minfo->flags == XT_MULTIPORT_EITHER
                            && (src == s || dst == s))
-                               return 1 ^ minfo->invert;
+                               return true ^ minfo->invert;
                }
        }
 
-       return minfo->invert;
+       return minfo->invert;
 }
 
-static int
+static bool
 match(const struct sk_buff *skb,
       const struct net_device *in,
       const struct net_device *out,
@@ -102,13 +102,13 @@ match(const struct sk_buff *skb,
       const void *matchinfo,
       int offset,
       unsigned int protoff,
-      int *hotdrop)
+      bool *hotdrop)
 {
        __be16 _ports[2], *pptr;
        const struct xt_multiport *multiinfo = matchinfo;
 
        if (offset)
-               return 0;
+               return false;
 
        pptr = skb_header_pointer(skb, protoff, sizeof(_ports), _ports);
        if (pptr == NULL) {
@@ -116,8 +116,8 @@ match(const struct sk_buff *skb,
                 * can't.  Hence, no choice but to drop.
                 */
                duprintf("xt_multiport: Dropping evil offset=0 tinygram.\n");
-               *hotdrop = 1;
-               return 0;
+               *hotdrop = true;
+               return false;
        }
 
        return ports_match(multiinfo->ports,
@@ -125,7 +125,7 @@ match(const struct sk_buff *skb,
                           ntohs(pptr[0]), ntohs(pptr[1]));
 }
 
-static int
+static bool
 match_v1(const struct sk_buff *skb,
         const struct net_device *in,
         const struct net_device *out,
@@ -133,13 +133,13 @@ match_v1(const struct sk_buff *skb,
         const void *matchinfo,
         int offset,
         unsigned int protoff,
-        int *hotdrop)
+        bool *hotdrop)
 {
        __be16 _ports[2], *pptr;
        const struct xt_multiport_v1 *multiinfo = matchinfo;
 
        if (offset)
-               return 0;
+               return false;
 
        pptr = skb_header_pointer(skb, protoff, sizeof(_ports), _ports);
        if (pptr == NULL) {
@@ -147,14 +147,14 @@ match_v1(const struct sk_buff *skb,
                 * can't.  Hence, no choice but to drop.
                 */
                duprintf("xt_multiport: Dropping evil offset=0 tinygram.\n");
-               *hotdrop = 1;
-               return 0;
+               *hotdrop = true;
+               return false;
        }
 
        return ports_match_v1(multiinfo, ntohs(pptr[0]), ntohs(pptr[1]));
 }
 
-static inline int
+static inline bool
 check(u_int16_t proto,
       u_int8_t ip_invflags,
       u_int8_t match_flags,
@@ -172,7 +172,7 @@ check(u_int16_t proto,
 }
 
 /* Called when user tries to insert an entry of this type. */
-static int
+static bool
 checkentry(const char *tablename,
           const void *info,
           const struct xt_match *match,
@@ -186,7 +186,7 @@ checkentry(const char *tablename,
                     multiinfo->count);
 }
 
-static int
+static bool
 checkentry_v1(const char *tablename,
              const void *info,
              const struct xt_match *match,
@@ -200,7 +200,7 @@ checkentry_v1(const char *tablename,
                     multiinfo->count);
 }
 
-static int
+static bool
 checkentry6(const char *tablename,
            const void *info,
            const struct xt_match *match,
@@ -214,7 +214,7 @@ checkentry6(const char *tablename,
                     multiinfo->count);
 }
 
-static int
+static bool
 checkentry6_v1(const char *tablename,
               const void *info,
               const struct xt_match *match,
@@ -228,7 +228,7 @@ checkentry6_v1(const char *tablename,
                     multiinfo->count);
 }
 
-static struct xt_match xt_multiport_match[] = {
+static struct xt_match xt_multiport_match[] __read_mostly = {
        {
                .name           = "multiport",
                .family         = AF_INET,