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/ipv4/ip_options.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/ipv4/ip_options.c')
-rw-r--r-- | net/ipv4/ip_options.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/ipv4/ip_options.c b/net/ipv4/ip_options.c index 95722ed0e5bb..708b99494e23 100644 --- a/net/ipv4/ip_options.c +++ b/net/ipv4/ip_options.c | |||
@@ -578,8 +578,10 @@ void ip_forward_options(struct sk_buff *skb) | |||
578 | ip_hdr(skb)->daddr = opt->nexthop; | 578 | ip_hdr(skb)->daddr = opt->nexthop; |
579 | ip_rt_get_source(&optptr[srrptr-1], skb, rt); | 579 | ip_rt_get_source(&optptr[srrptr-1], skb, rt); |
580 | optptr[2] = srrptr+4; | 580 | optptr[2] = srrptr+4; |
581 | } else if (net_ratelimit()) | 581 | } else { |
582 | pr_crit("%s(): Argh! Destination lost!\n", __func__); | 582 | net_crit_ratelimited("%s(): Argh! Destination lost!\n", |
583 | __func__); | ||
584 | } | ||
583 | if (opt->ts_needaddr) { | 585 | if (opt->ts_needaddr) { |
584 | optptr = raw + opt->ts; | 586 | optptr = raw + opt->ts; |
585 | ip_rt_get_source(&optptr[optptr[2]-9], skb, rt); | 587 | ip_rt_get_source(&optptr[optptr[2]-9], skb, rt); |