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/ah6.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/ah6.c')
-rw-r--r-- | net/ipv6/ah6.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/net/ipv6/ah6.c b/net/ipv6/ah6.c index 6d16eb0e0c7f..8ab1989198f6 100644 --- a/net/ipv6/ah6.c +++ b/net/ipv6/ah6.c | |||
@@ -272,10 +272,9 @@ static int ipv6_clear_mutable_options(struct ipv6hdr *iph, int len, int dir) | |||
272 | ipv6_rearrange_destopt(iph, exthdr.opth); | 272 | ipv6_rearrange_destopt(iph, exthdr.opth); |
273 | case NEXTHDR_HOP: | 273 | case NEXTHDR_HOP: |
274 | if (!zero_out_mutable_opts(exthdr.opth)) { | 274 | if (!zero_out_mutable_opts(exthdr.opth)) { |
275 | LIMIT_NETDEBUG( | 275 | net_dbg_ratelimited("overrun %sopts\n", |
276 | KERN_WARNING "overrun %sopts\n", | 276 | nexthdr == NEXTHDR_HOP ? |
277 | nexthdr == NEXTHDR_HOP ? | 277 | "hop" : "dest"); |
278 | "hop" : "dest"); | ||
279 | return -EINVAL; | 278 | return -EINVAL; |
280 | } | 279 | } |
281 | break; | 280 | break; |