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/sit.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/sit.c')
-rw-r--r-- | net/ipv6/sit.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c index e5fef943e30a..a36a09701bff 100644 --- a/net/ipv6/sit.c +++ b/net/ipv6/sit.c | |||
@@ -702,8 +702,7 @@ static netdev_tx_t ipip6_tunnel_xmit(struct sk_buff *skb, | |||
702 | neigh = dst_neigh_lookup(skb_dst(skb), &iph6->daddr); | 702 | neigh = dst_neigh_lookup(skb_dst(skb), &iph6->daddr); |
703 | 703 | ||
704 | if (neigh == NULL) { | 704 | if (neigh == NULL) { |
705 | if (net_ratelimit()) | 705 | net_dbg_ratelimited("sit: nexthop == NULL\n"); |
706 | printk(KERN_DEBUG "sit: nexthop == NULL\n"); | ||
707 | goto tx_error; | 706 | goto tx_error; |
708 | } | 707 | } |
709 | 708 | ||
@@ -732,8 +731,7 @@ static netdev_tx_t ipip6_tunnel_xmit(struct sk_buff *skb, | |||
732 | neigh = dst_neigh_lookup(skb_dst(skb), &iph6->daddr); | 731 | neigh = dst_neigh_lookup(skb_dst(skb), &iph6->daddr); |
733 | 732 | ||
734 | if (neigh == NULL) { | 733 | if (neigh == NULL) { |
735 | if (net_ratelimit()) | 734 | net_dbg_ratelimited("sit: nexthop == NULL\n"); |
736 | printk(KERN_DEBUG "sit: nexthop == NULL\n"); | ||
737 | goto tx_error; | 735 | goto tx_error; |
738 | } | 736 | } |
739 | 737 | ||