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/core/skbuff.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/core/skbuff.c')
-rw-r--r-- | net/core/skbuff.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/net/core/skbuff.c b/net/core/skbuff.c index 2c35da818ef9..2a1871942317 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c | |||
@@ -3299,10 +3299,8 @@ bool skb_partial_csum_set(struct sk_buff *skb, u16 start, u16 off) | |||
3299 | { | 3299 | { |
3300 | if (unlikely(start > skb_headlen(skb)) || | 3300 | if (unlikely(start > skb_headlen(skb)) || |
3301 | unlikely((int)start + off > skb_headlen(skb) - 2)) { | 3301 | unlikely((int)start + off > skb_headlen(skb) - 2)) { |
3302 | if (net_ratelimit()) | 3302 | net_warn_ratelimited("bad partial csum: csum=%u/%u len=%u\n", |
3303 | printk(KERN_WARNING | 3303 | start, off, skb_headlen(skb)); |
3304 | "bad partial csum: csum=%u/%u len=%u\n", | ||
3305 | start, off, skb_headlen(skb)); | ||
3306 | return false; | 3304 | return false; |
3307 | } | 3305 | } |
3308 | skb->ip_summed = CHECKSUM_PARTIAL; | 3306 | skb->ip_summed = CHECKSUM_PARTIAL; |
@@ -3314,8 +3312,7 @@ EXPORT_SYMBOL_GPL(skb_partial_csum_set); | |||
3314 | 3312 | ||
3315 | void __skb_warn_lro_forwarding(const struct sk_buff *skb) | 3313 | void __skb_warn_lro_forwarding(const struct sk_buff *skb) |
3316 | { | 3314 | { |
3317 | if (net_ratelimit()) | 3315 | net_warn_ratelimited("%s: received packets cannot be forwarded while LRO is enabled\n", |
3318 | pr_warning("%s: received packets cannot be forwarded" | 3316 | skb->dev->name); |
3319 | " while LRO is enabled\n", skb->dev->name); | ||
3320 | } | 3317 | } |
3321 | EXPORT_SYMBOL(__skb_warn_lro_forwarding); | 3318 | EXPORT_SYMBOL(__skb_warn_lro_forwarding); |