summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick McHardy <kaber@trash.net>2013-07-28 22:54:07 +0200
committerPablo Neira Ayuso <pablo@netfilter.org>2013-07-31 16:37:27 +0200
commit6704af53fc3c5d4113d67d5ff40943d420966cd8 (patch)
treed25803b8e3093523cb592bb0c3ccc55dd9357261
parent5774c94aceade9eadc311957fe31322cc3ad2016 (diff)
downloadop-kernel-dev-6704af53fc3c5d4113d67d5ff40943d420966cd8.zip
op-kernel-dev-6704af53fc3c5d4113d67d5ff40943d420966cd8.tar.gz
netfilter: nf_conntrack: remove net_ratelimit() for LOG_INVALID()
Logging of invalid packets has to be explicitly enabled. Rate-limiting these messages is inconsistent with other netfilter logging features and makes debugging harder. Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
-rw-r--r--include/net/netfilter/nf_conntrack_l4proto.h7
1 files changed, 0 insertions, 7 deletions
diff --git a/include/net/netfilter/nf_conntrack_l4proto.h b/include/net/netfilter/nf_conntrack_l4proto.h
index 914d8d9..b411d7b 100644
--- a/include/net/netfilter/nf_conntrack_l4proto.h
+++ b/include/net/netfilter/nf_conntrack_l4proto.h
@@ -148,17 +148,10 @@ extern int nf_ct_port_nlattr_tuple_size(void);
extern const struct nla_policy nf_ct_port_nla_policy[];
#ifdef CONFIG_SYSCTL
-#ifdef DEBUG_INVALID_PACKETS
#define LOG_INVALID(net, proto) \
((net)->ct.sysctl_log_invalid == (proto) || \
(net)->ct.sysctl_log_invalid == IPPROTO_RAW)
#else
-#define LOG_INVALID(net, proto) \
- (((net)->ct.sysctl_log_invalid == (proto) || \
- (net)->ct.sysctl_log_invalid == IPPROTO_RAW) \
- && net_ratelimit())
-#endif
-#else
static inline int LOG_INVALID(struct net *net, int proto) { return 0; }
#endif /* CONFIG_SYSCTL */
OpenPOWER on IntegriCloud