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

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

diff --git a/net/ipv6/netfilter/ip6t_ah.c b/net/ipv6/netfilter/ip6t_ah.c
index 27b7bd279c0e3b47f2daf55454124f85956a7b0e..2a25fe25e0e0d236947a6f3c281b3e72415a3572 100644 (file)
--- a/net/ipv6/netfilter/ip6t_ah.c
+++ b/net/ipv6/netfilter/ip6t_ah.c
@@ -23,25 +23,20 @@ MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("IPv6 AH match");
 MODULE_AUTHOR("Andras Kis-Szabo <kisza@sch.bme.hu>");
 
-#if 0
-#define DEBUGP printk
-#else
-#define DEBUGP(format, args...)
-#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;
-       DEBUGP("ah spi_match:%c 0x%x <= 0x%x <= 0x%x",invert? '!':' ',
-              min,spi,max);
+       bool r;
+
+       pr_debug("ah spi_match:%c 0x%x <= 0x%x <= 0x%x",
+                invert ? '!' : ' ', min, spi, max);
        r = (spi >= min && spi <= max) ^ invert;
-       DEBUGP(" result %s\n",r? "PASS\n" : "FAILED\n");
+       pr_debug(" result %s\n", r ? "PASS" : "FAILED");
        return r;
 }
 
-static int
+static bool
 match(const struct sk_buff *skb,
       const struct net_device *in,
       const struct net_device *out,
@@ -51,7 +46,8 @@ match(const struct sk_buff *skb,
       unsigned int protoff,
       bool *hotdrop)
 {
-       struct ip_auth_hdr *ah, _ah;
+       struct ip_auth_hdr _ah;
+       const struct ip_auth_hdr *ah;
        const struct ip6t_ah *ahinfo = matchinfo;
        unsigned int ptr;
        unsigned int hdrlen = 0;
@@ -61,39 +57,39 @@ match(const struct sk_buff *skb,
        if (err < 0) {
                if (err != -ENOENT)
                        *hotdrop = true;
-               return 0;
+               return false;
        }
 
        ah = skb_header_pointer(skb, ptr, sizeof(_ah), &_ah);
        if (ah == NULL) {
                *hotdrop = true;
-               return 0;
+               return false;
        }
 
        hdrlen = (ah->hdrlen + 2) << 2;
 
-       DEBUGP("IPv6 AH LEN %u %u ", hdrlen, ah->hdrlen);
-       DEBUGP("RES %04X ", ah->reserved);
-       DEBUGP("SPI %u %08X\n", ntohl(ah->spi), ntohl(ah->spi));
-
-       DEBUGP("IPv6 AH spi %02X ",
-              (spi_match(ahinfo->spis[0], ahinfo->spis[1],
-                         ntohl(ah->spi),
-                         !!(ahinfo->invflags & IP6T_AH_INV_SPI))));
-       DEBUGP("len %02X %04X %02X ",
-              ahinfo->hdrlen, hdrlen,
-              (!ahinfo->hdrlen ||
-               (ahinfo->hdrlen == hdrlen) ^
-               !!(ahinfo->invflags & IP6T_AH_INV_LEN)));
-       DEBUGP("res %02X %04X %02X\n",
-              ahinfo->hdrres, ah->reserved,
-              !(ahinfo->hdrres && ah->reserved));
+       pr_debug("IPv6 AH LEN %u %u ", hdrlen, ah->hdrlen);
+       pr_debug("RES %04X ", ah->reserved);
+       pr_debug("SPI %u %08X\n", ntohl(ah->spi), ntohl(ah->spi));
+
+       pr_debug("IPv6 AH spi %02X ",
+                spi_match(ahinfo->spis[0], ahinfo->spis[1],
+                          ntohl(ah->spi),
+                          !!(ahinfo->invflags & IP6T_AH_INV_SPI)));
+       pr_debug("len %02X %04X %02X ",
+                ahinfo->hdrlen, hdrlen,
+                (!ahinfo->hdrlen ||
+                 (ahinfo->hdrlen == hdrlen) ^
+                 !!(ahinfo->invflags & IP6T_AH_INV_LEN)));
+       pr_debug("res %02X %04X %02X\n",
+                ahinfo->hdrres, ah->reserved,
+                !(ahinfo->hdrres && ah->reserved));
 
        return (ah != NULL)
               &&
-              (spi_match(ahinfo->spis[0], ahinfo->spis[1],
-                         ntohl(ah->spi),
-                         !!(ahinfo->invflags & IP6T_AH_INV_SPI)))
+              spi_match(ahinfo->spis[0], ahinfo->spis[1],
+                        ntohl(ah->spi),
+                        !!(ahinfo->invflags & IP6T_AH_INV_SPI))
               &&
               (!ahinfo->hdrlen ||
                (ahinfo->hdrlen == hdrlen) ^
@@ -103,7 +99,7 @@ match(const struct sk_buff *skb,
 }
 
 /* Called when user tries to insert an entry of this type. */
-static int
+static bool
 checkentry(const char *tablename,
          const void *entry,
          const struct xt_match *match,
@@ -113,13 +109,13 @@ checkentry(const char *tablename,
        const struct ip6t_ah *ahinfo = matchinfo;
 
        if (ahinfo->invflags & ~IP6T_AH_INV_MASK) {
-               DEBUGP("ip6t_ah: unknown flags %X\n", ahinfo->invflags);
-               return 0;
+               pr_debug("ip6t_ah: unknown flags %X\n", ahinfo->invflags);
+               return false;
        }
-       return 1;
+       return true;
 }
 
-static struct xt_match ah_match = {
+static struct xt_match ah_match __read_mostly = {
        .name           = "ah",
        .family         = AF_INET6,
        .match          = match,