diff options
author | Joe Perches <joe@perches.com> | 2014-11-11 13:59:17 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-11-11 14:10:31 -0500 |
commit | ba7a46f16dd29f93303daeb1fee8af316c5a07f4 (patch) | |
tree | 72568f33fadf0b75d02f6e30bca1404a5aae2530 /net/ipv4/tcp_input.c | |
parent | 5b61c4db49e2530ed10631321d4c73f49d560a93 (diff) |
net: Convert LIMIT_NETDEBUG to net_dbg_ratelimited
Use the more common dynamic_debug capable net_dbg_ratelimited
and remove the LIMIT_NETDEBUG macro.
All messages are still ratelimited.
Some KERN_<LEVEL> uses are changed to KERN_DEBUG.
This may have some negative impact on messages that were
emitted at KERN_INFO that are not not enabled at all unless
DEBUG is defined or dynamic_debug is enabled. Even so,
these messages are now _not_ emitted by default.
This also eliminates the use of the net_msg_warn sysctl
"/proc/sys/net/core/warnings". For backward compatibility,
the sysctl is not removed, but it has no function. The extern
declaration of net_msg_warn is removed from sock.h and made
static in net/core/sysctl_net_core.c
Miscellanea:
o Update the sysctl documentation
o Remove the embedded uses of pr_fmt
o Coalesce format fragments
o Realign arguments
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/tcp_input.c')
-rw-r--r-- | net/ipv4/tcp_input.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index 5f979c7f5135..d91436ba17ea 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c | |||
@@ -5854,12 +5854,12 @@ static inline void pr_drop_req(struct request_sock *req, __u16 port, int family) | |||
5854 | struct inet_request_sock *ireq = inet_rsk(req); | 5854 | struct inet_request_sock *ireq = inet_rsk(req); |
5855 | 5855 | ||
5856 | if (family == AF_INET) | 5856 | if (family == AF_INET) |
5857 | LIMIT_NETDEBUG(KERN_DEBUG pr_fmt("drop open request from %pI4/%u\n"), | 5857 | net_dbg_ratelimited("drop open request from %pI4/%u\n", |
5858 | &ireq->ir_rmt_addr, port); | 5858 | &ireq->ir_rmt_addr, port); |
5859 | #if IS_ENABLED(CONFIG_IPV6) | 5859 | #if IS_ENABLED(CONFIG_IPV6) |
5860 | else if (family == AF_INET6) | 5860 | else if (family == AF_INET6) |
5861 | LIMIT_NETDEBUG(KERN_DEBUG pr_fmt("drop open request from %pI6/%u\n"), | 5861 | net_dbg_ratelimited("drop open request from %pI6/%u\n", |
5862 | &ireq->ir_v6_rmt_addr, port); | 5862 | &ireq->ir_v6_rmt_addr, port); |
5863 | #endif | 5863 | #endif |
5864 | } | 5864 | } |
5865 | 5865 | ||