diff options
author | Joe Perches <joe@perches.com> | 2012-05-13 17:56:26 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-05-15 13:45:03 -0400 |
commit | e87cc4728f0e2fb663e592a1141742b1d6c63256 (patch) | |
tree | b8219696d37f0c8d0521d5853560b97fc96dc667 /net/ipv6/reassembly.c | |
parent | 3a3bfb61e64476ff1e4ac3122cb6dec9c79b795c (diff) |
net: Convert net_ratelimit uses to net_<level>_ratelimited
Standardize the net core ratelimited logging functions.
Coalesce formats, align arguments.
Change a printk then vprintk sequence to use printf extension %pV.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/reassembly.c')
-rw-r--r-- | net/ipv6/reassembly.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/net/ipv6/reassembly.c b/net/ipv6/reassembly.c index 54c5d2b704df..f1b86fdc06ad 100644 --- a/net/ipv6/reassembly.c +++ b/net/ipv6/reassembly.c | |||
@@ -518,12 +518,10 @@ static int ip6_frag_reasm(struct frag_queue *fq, struct sk_buff *prev, | |||
518 | return 1; | 518 | return 1; |
519 | 519 | ||
520 | out_oversize: | 520 | out_oversize: |
521 | if (net_ratelimit()) | 521 | net_dbg_ratelimited("ip6_frag_reasm: payload len = %d\n", payload_len); |
522 | printk(KERN_DEBUG "ip6_frag_reasm: payload len = %d\n", payload_len); | ||
523 | goto out_fail; | 522 | goto out_fail; |
524 | out_oom: | 523 | out_oom: |
525 | if (net_ratelimit()) | 524 | net_dbg_ratelimited("ip6_frag_reasm: no memory for reassembly\n"); |
526 | printk(KERN_DEBUG "ip6_frag_reasm: no memory for reassembly\n"); | ||
527 | out_fail: | 525 | out_fail: |
528 | rcu_read_lock(); | 526 | rcu_read_lock(); |
529 | IP6_INC_STATS_BH(net, __in6_dev_get(dev), IPSTATS_MIB_REASMFAILS); | 527 | IP6_INC_STATS_BH(net, __in6_dev_get(dev), IPSTATS_MIB_REASMFAILS); |