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/ipv6/esp6.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/ipv6/esp6.c')
-rw-r--r-- | net/ipv6/esp6.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/esp6.c b/net/ipv6/esp6.c index d21d7b22eebc..d2c2d749b6db 100644 --- a/net/ipv6/esp6.c +++ b/net/ipv6/esp6.c | |||
@@ -286,8 +286,8 @@ static int esp_input_done2(struct sk_buff *skb, int err) | |||
286 | err = -EINVAL; | 286 | err = -EINVAL; |
287 | padlen = nexthdr[0]; | 287 | padlen = nexthdr[0]; |
288 | if (padlen + 2 + alen >= elen) { | 288 | if (padlen + 2 + alen >= elen) { |
289 | LIMIT_NETDEBUG(KERN_WARNING "ipsec esp packet is garbage " | 289 | net_dbg_ratelimited("ipsec esp packet is garbage padlen=%d, elen=%d\n", |
290 | "padlen=%d, elen=%d\n", padlen + 2, elen - alen); | 290 | padlen + 2, elen - alen); |
291 | goto out; | 291 | goto out; |
292 | } | 292 | } |
293 | 293 | ||