[NETFILTER]: x_tables: switch xt_match->match to bool

[deliverable/linux.git] / net / netfilter / xt_esp.c

diff --git a/net/netfilter/xt_esp.c b/net/netfilter/xt_esp.c
index 5d3421bcd8507ac4f900604c6918d03300fb621f..1a945cb7c35937fabeed98a7999509fcb58f848d 100644 (file)
--- a/net/netfilter/xt_esp.c
+++ b/net/netfilter/xt_esp.c
@@ -31,10 +31,10 @@ MODULE_ALIAS("ip6t_esp");
 #endif
 
 /* Returns 1 if the spi is matched by the range, 0 otherwise */
-static inline int
-spi_match(u_int32_t min, u_int32_t max, u_int32_t spi, int invert)
+static inline bool
+spi_match(u_int32_t min, u_int32_t max, u_int32_t spi, bool invert)
 {
-       int r = 0;
+       bool r;
        duprintf("esp spi_match:%c 0x%x <= 0x%x <= 0x%x", invert ? '!' : ' ',
                 min, spi, max);
        r = (spi >= min && spi <= max) ^ invert;
@@ -42,7 +42,7 @@ spi_match(u_int32_t min, u_int32_t max, u_int32_t spi, int invert)
        return r;
 }
 
-static int
+static bool
 match(const struct sk_buff *skb,
       const struct net_device *in,
       const struct net_device *out,
@@ -57,7 +57,7 @@ match(const struct sk_buff *skb,
 
        /* Must not be a fragment. */
        if (offset)
-               return 0;
+               return false;
 
        eh = skb_header_pointer(skb, protoff, sizeof(_esp), &_esp);
        if (eh == NULL) {
@@ -66,7 +66,7 @@ match(const struct sk_buff *skb,
                 */
                duprintf("Dropping evil ESP tinygram.\n");
                *hotdrop = true;
-               return 0;
+               return false;
        }
 
        return spi_match(espinfo->spis[0], espinfo->spis[1], ntohl(eh->spi),