Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6

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

diff --git a/net/netfilter/xt_tcpudp.c b/net/netfilter/xt_tcpudp.c
index ca9ccdd931bccc788327320008c3de5264fc9dc6..ab7d845224fce9f7dad1b92f3d6a91d9c7c16411 100644 (file)
--- a/net/netfilter/xt_tcpudp.c
+++ b/net/netfilter/xt_tcpudp.c
@@ -27,21 +27,18 @@ MODULE_ALIAS("ip6t_tcp");
 
 
 /* Returns 1 if the port is matched by the range, 0 otherwise */
-static inline int
-port_match(u_int16_t min, u_int16_t max, u_int16_t port, int invert)
+static inline bool
+port_match(u_int16_t min, u_int16_t max, u_int16_t port, bool invert)
 {
-       int ret;
-
-       ret = (port >= min && port <= max) ^ invert;
-       return ret;
+       return (port >= min && port <= max) ^ invert;
 }
 
-static int
+static bool
 tcp_find_option(u_int8_t option,
                const struct sk_buff *skb,
                unsigned int protoff,
                unsigned int optlen,
-               int invert,
+               bool invert,
                bool *hotdrop)
 {
        /* tcp.doff is only 4 bits, ie. max 15 * 4 bytes */
@@ -58,7 +55,7 @@ tcp_find_option(u_int8_t option,
                                optlen, _opt);
        if (op == NULL) {
                *hotdrop = true;
-               return 0;
+               return false;
        }
 
        for (i = 0; i < optlen; ) {
@@ -70,7 +67,7 @@ tcp_find_option(u_int8_t option,
        return invert;
 }
 
-static int
+static bool
 tcp_match(const struct sk_buff *skb,
          const struct net_device *in,
          const struct net_device *out,
@@ -95,10 +92,10 @@ tcp_match(const struct sk_buff *skb,
                        *hotdrop = true;
                }
                /* Must not be a fragment. */
-               return 0;
+               return false;
        }
 
-#define FWINVTCP(bool,invflg) ((bool) ^ !!(tcpinfo->invflags & invflg))
+#define FWINVTCP(bool, invflg) ((bool) ^ !!(tcpinfo->invflags & (invflg)))
 
        th = skb_header_pointer(skb, protoff, sizeof(_tcph), &_tcph);
        if (th == NULL) {
@@ -106,37 +103,37 @@ tcp_match(const struct sk_buff *skb,
                   can't.  Hence, no choice but to drop. */
                duprintf("Dropping evil TCP offset=0 tinygram.\n");
                *hotdrop = true;
-               return 0;
+               return false;
        }
 
        if (!port_match(tcpinfo->spts[0], tcpinfo->spts[1],
                        ntohs(th->source),
                        !!(tcpinfo->invflags & XT_TCP_INV_SRCPT)))
-               return 0;
+               return false;
        if (!port_match(tcpinfo->dpts[0], tcpinfo->dpts[1],
                        ntohs(th->dest),
                        !!(tcpinfo->invflags & XT_TCP_INV_DSTPT)))
-               return 0;
+               return false;
        if (!FWINVTCP((((unsigned char *)th)[13] & tcpinfo->flg_mask)
                      == tcpinfo->flg_cmp,
                      XT_TCP_INV_FLAGS))
-               return 0;
+               return false;
        if (tcpinfo->option) {
                if (th->doff * 4 < sizeof(_tcph)) {
                        *hotdrop = true;
-                       return 0;
+                       return false;
                }
                if (!tcp_find_option(tcpinfo->option, skb, protoff,
                                     th->doff*4 - sizeof(_tcph),
                                     tcpinfo->invflags & XT_TCP_INV_OPTION,
                                     hotdrop))
-                       return 0;
+                       return false;
        }
-       return 1;
+       return true;
 }
 
 /* Called when user tries to insert an entry of this type. */
-static int
+static bool
 tcp_checkentry(const char *tablename,
               const void *info,
               const struct xt_match *match,
@@ -149,7 +146,7 @@ tcp_checkentry(const char *tablename,
        return !(tcpinfo->invflags & ~XT_TCP_INV_MASK);
 }
 
-static int
+static bool
 udp_match(const struct sk_buff *skb,
          const struct net_device *in,
          const struct net_device *out,
@@ -164,7 +161,7 @@ udp_match(const struct sk_buff *skb,
 
        /* Must not be a fragment. */
        if (offset)
-               return 0;
+               return false;
 
        uh = skb_header_pointer(skb, protoff, sizeof(_udph), &_udph);
        if (uh == NULL) {
@@ -172,7 +169,7 @@ udp_match(const struct sk_buff *skb,
                   can't.  Hence, no choice but to drop. */
                duprintf("Dropping evil UDP tinygram.\n");
                *hotdrop = true;
-               return 0;
+               return false;
        }
 
        return port_match(udpinfo->spts[0], udpinfo->spts[1],
@@ -184,7 +181,7 @@ udp_match(const struct sk_buff *skb,
 }
 
 /* Called when user tries to insert an entry of this type. */
-static int
+static bool
 udp_checkentry(const char *tablename,
               const void *info,
               const struct xt_match *match,
@@ -197,7 +194,7 @@ udp_checkentry(const char *tablename,
        return !(udpinfo->invflags & ~XT_UDP_INV_MASK);
 }
 
-static struct xt_match xt_tcpudp_match[] = {
+static struct xt_match xt_tcpudp_match[] __read_mostly = {
        {
                .name           = "tcp",
                .family         = AF_INET,