Merge branch 'ioat-md-accel-for-linus' of git://lost.foo-projects.org/~dwillia2/git/iop

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

diff --git a/net/ipv6/netfilter/ip6t_frag.c b/net/ipv6/netfilter/ip6t_frag.c
index e0e416bb284a9527466a4bcdbb53a0afe513cdc9..968aeba020737856abb6e1de3f4803849c9c2e2e 100644 (file)
--- a/net/ipv6/netfilter/ip6t_frag.c
+++ b/net/ipv6/netfilter/ip6t_frag.c
@@ -22,21 +22,15 @@ MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("IPv6 FRAG 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 id is matched by the range, 0 otherwise */
 static inline bool
 id_match(u_int32_t min, u_int32_t max, u_int32_t id, bool invert)
 {
        bool r;
-       DEBUGP("frag id_match:%c 0x%x <= 0x%x <= 0x%x", invert ? '!' : ' ',
-              min, id, max);
+       pr_debug("frag id_match:%c 0x%x <= 0x%x <= 0x%x", invert ? '!' : ' ',
+                min, id, max);
        r = (id >= min && id <= max) ^ invert;
-       DEBUGP(" result %s\n", r ? "PASS" : "FAILED");
+       pr_debug(" result %s\n", r ? "PASS" : "FAILED");
        return r;
 }
 
@@ -69,43 +63,43 @@ match(const struct sk_buff *skb,
                return false;
        }
 
-       DEBUGP("INFO %04X ", fh->frag_off);
-       DEBUGP("OFFSET %04X ", ntohs(fh->frag_off) & ~0x7);
-       DEBUGP("RES %02X %04X", fh->reserved, ntohs(fh->frag_off) & 0x6);
-       DEBUGP("MF %04X ", fh->frag_off & htons(IP6_MF));
-       DEBUGP("ID %u %08X\n", ntohl(fh->identification),
-              ntohl(fh->identification));
-
-       DEBUGP("IPv6 FRAG id %02X ",
-              (id_match(fraginfo->ids[0], fraginfo->ids[1],
-                        ntohl(fh->identification),
-                        !!(fraginfo->invflags & IP6T_FRAG_INV_IDS))));
-       DEBUGP("res %02X %02X%04X %02X ",
-              (fraginfo->flags & IP6T_FRAG_RES), fh->reserved,
-              ntohs(fh->frag_off) & 0x6,
-              !((fraginfo->flags & IP6T_FRAG_RES)
-                && (fh->reserved || (ntohs(fh->frag_off) & 0x06))));
-       DEBUGP("first %02X %02X %02X ",
-              (fraginfo->flags & IP6T_FRAG_FST),
-              ntohs(fh->frag_off) & ~0x7,
-              !((fraginfo->flags & IP6T_FRAG_FST)
-                && (ntohs(fh->frag_off) & ~0x7)));
-       DEBUGP("mf %02X %02X %02X ",
-              (fraginfo->flags & IP6T_FRAG_MF),
-              ntohs(fh->frag_off) & IP6_MF,
-              !((fraginfo->flags & IP6T_FRAG_MF)
-                && !((ntohs(fh->frag_off) & IP6_MF))));
-       DEBUGP("last %02X %02X %02X\n",
-              (fraginfo->flags & IP6T_FRAG_NMF),
-              ntohs(fh->frag_off) & IP6_MF,
-              !((fraginfo->flags & IP6T_FRAG_NMF)
-                && (ntohs(fh->frag_off) & IP6_MF)));
+       pr_debug("INFO %04X ", fh->frag_off);
+       pr_debug("OFFSET %04X ", ntohs(fh->frag_off) & ~0x7);
+       pr_debug("RES %02X %04X", fh->reserved, ntohs(fh->frag_off) & 0x6);
+       pr_debug("MF %04X ", fh->frag_off & htons(IP6_MF));
+       pr_debug("ID %u %08X\n", ntohl(fh->identification),
+                ntohl(fh->identification));
+
+       pr_debug("IPv6 FRAG id %02X ",
+                id_match(fraginfo->ids[0], fraginfo->ids[1],
+                         ntohl(fh->identification),
+                         !!(fraginfo->invflags & IP6T_FRAG_INV_IDS)));
+       pr_debug("res %02X %02X%04X %02X ",
+                fraginfo->flags & IP6T_FRAG_RES, fh->reserved,
+                ntohs(fh->frag_off) & 0x6,
+                !((fraginfo->flags & IP6T_FRAG_RES)
+                  && (fh->reserved || (ntohs(fh->frag_off) & 0x06))));
+       pr_debug("first %02X %02X %02X ",
+                fraginfo->flags & IP6T_FRAG_FST,
+                ntohs(fh->frag_off) & ~0x7,
+                !((fraginfo->flags & IP6T_FRAG_FST)
+                  && (ntohs(fh->frag_off) & ~0x7)));
+       pr_debug("mf %02X %02X %02X ",
+                fraginfo->flags & IP6T_FRAG_MF,
+                ntohs(fh->frag_off) & IP6_MF,
+                !((fraginfo->flags & IP6T_FRAG_MF)
+                  && !((ntohs(fh->frag_off) & IP6_MF))));
+       pr_debug("last %02X %02X %02X\n",
+                fraginfo->flags & IP6T_FRAG_NMF,
+                ntohs(fh->frag_off) & IP6_MF,
+                !((fraginfo->flags & IP6T_FRAG_NMF)
+                  && (ntohs(fh->frag_off) & IP6_MF)));
 
        return (fh != NULL)
               &&
-              (id_match(fraginfo->ids[0], fraginfo->ids[1],
-                        ntohl(fh->identification),
-                        !!(fraginfo->invflags & IP6T_FRAG_INV_IDS)))
+              id_match(fraginfo->ids[0], fraginfo->ids[1],
+                       ntohl(fh->identification),
+                       !!(fraginfo->invflags & IP6T_FRAG_INV_IDS))
               &&
               !((fraginfo->flags & IP6T_FRAG_RES)
                 && (fh->reserved || (ntohs(fh->frag_off) & 0x6)))
@@ -131,13 +125,13 @@ checkentry(const char *tablename,
        const struct ip6t_frag *fraginfo = matchinfo;
 
        if (fraginfo->invflags & ~IP6T_FRAG_INV_MASK) {
-               DEBUGP("ip6t_frag: unknown flags %X\n", fraginfo->invflags);
+               pr_debug("ip6t_frag: unknown flags %X\n", fraginfo->invflags);
                return false;
        }
        return true;
 }
 
-static struct xt_match frag_match = {
+static struct xt_match frag_match __read_mostly = {
        .name           = "frag",
        .family         = AF_INET6,
        .match          = match,