diff options
author | Jan Engelhardt <jengelh@medozas.de> | 2010-03-17 21:22:32 -0400 |
---|---|---|
committer | Jan Engelhardt <jengelh@medozas.de> | 2010-03-18 09:20:07 -0400 |
commit | be91fd5e323b46450ca82f6828e933e3791fb2f2 (patch) | |
tree | 1a664fb7887e8a0d7f1507780d3533e669e1c3a3 /net/ipv6 | |
parent | 85bc3f38147c5d3fb1eb9ca2236536389b592cae (diff) |
netfilter: xtables: replace custom duprintf with pr_debug
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
Diffstat (limited to 'net/ipv6')
-rw-r--r-- | net/ipv6/netfilter/ip6t_mh.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/net/ipv6/netfilter/ip6t_mh.c b/net/ipv6/netfilter/ip6t_mh.c index aafe4e66577b..0181eb81d24b 100644 --- a/net/ipv6/netfilter/ip6t_mh.c +++ b/net/ipv6/netfilter/ip6t_mh.c | |||
@@ -11,6 +11,7 @@ | |||
11 | * Based on net/netfilter/xt_tcpudp.c | 11 | * Based on net/netfilter/xt_tcpudp.c |
12 | * | 12 | * |
13 | */ | 13 | */ |
14 | #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt | ||
14 | #include <linux/types.h> | 15 | #include <linux/types.h> |
15 | #include <linux/module.h> | 16 | #include <linux/module.h> |
16 | #include <net/ip.h> | 17 | #include <net/ip.h> |
@@ -24,12 +25,6 @@ | |||
24 | MODULE_DESCRIPTION("Xtables: IPv6 Mobility Header match"); | 25 | MODULE_DESCRIPTION("Xtables: IPv6 Mobility Header match"); |
25 | MODULE_LICENSE("GPL"); | 26 | MODULE_LICENSE("GPL"); |
26 | 27 | ||
27 | #ifdef DEBUG_IP_FIREWALL_USER | ||
28 | #define duprintf(format, args...) printk(format , ## args) | ||
29 | #else | ||
30 | #define duprintf(format, args...) | ||
31 | #endif | ||
32 | |||
33 | /* Returns 1 if the type is matched by the range, 0 otherwise */ | 28 | /* Returns 1 if the type is matched by the range, 0 otherwise */ |
34 | static inline bool | 29 | static inline bool |
35 | type_match(u_int8_t min, u_int8_t max, u_int8_t type, bool invert) | 30 | type_match(u_int8_t min, u_int8_t max, u_int8_t type, bool invert) |
@@ -51,13 +46,13 @@ static bool mh_mt6(const struct sk_buff *skb, const struct xt_match_param *par) | |||
51 | if (mh == NULL) { | 46 | if (mh == NULL) { |
52 | /* We've been asked to examine this packet, and we | 47 | /* We've been asked to examine this packet, and we |
53 | can't. Hence, no choice but to drop. */ | 48 | can't. Hence, no choice but to drop. */ |
54 | duprintf("Dropping evil MH tinygram.\n"); | 49 | pr_debug("Dropping evil MH tinygram.\n"); |
55 | *par->hotdrop = true; | 50 | *par->hotdrop = true; |
56 | return false; | 51 | return false; |
57 | } | 52 | } |
58 | 53 | ||
59 | if (mh->ip6mh_proto != IPPROTO_NONE) { | 54 | if (mh->ip6mh_proto != IPPROTO_NONE) { |
60 | duprintf("Dropping invalid MH Payload Proto: %u\n", | 55 | pr_debug("Dropping invalid MH Payload Proto: %u\n", |
61 | mh->ip6mh_proto); | 56 | mh->ip6mh_proto); |
62 | *par->hotdrop = true; | 57 | *par->hotdrop = true; |
63 | return false; | 58 | return false; |