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/tcp_ipv4.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/tcp_ipv4.c')
-rw-r--r-- | net/ipv4/tcp_ipv4.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c index 4ff5e1f70d16..2e76ffb66d7c 100644 --- a/net/ipv4/tcp_ipv4.c +++ b/net/ipv4/tcp_ipv4.c | |||
@@ -1239,12 +1239,11 @@ static int tcp_v4_inbound_md5_hash(struct sock *sk, const struct sk_buff *skb) | |||
1239 | NULL, NULL, skb); | 1239 | NULL, NULL, skb); |
1240 | 1240 | ||
1241 | if (genhash || memcmp(hash_location, newhash, 16) != 0) { | 1241 | if (genhash || memcmp(hash_location, newhash, 16) != 0) { |
1242 | if (net_ratelimit()) { | 1242 | net_info_ratelimited("MD5 Hash failed for (%pI4, %d)->(%pI4, %d)%s\n", |
1243 | pr_info("MD5 Hash failed for (%pI4, %d)->(%pI4, %d)%s\n", | 1243 | &iph->saddr, ntohs(th->source), |
1244 | &iph->saddr, ntohs(th->source), | 1244 | &iph->daddr, ntohs(th->dest), |
1245 | &iph->daddr, ntohs(th->dest), | 1245 | genhash ? " tcp_v4_calc_md5_hash failed" |
1246 | genhash ? " tcp_v4_calc_md5_hash failed" : ""); | 1246 | : ""); |
1247 | } | ||
1248 | return 1; | 1247 | return 1; |
1249 | } | 1248 | } |
1250 | return 0; | 1249 | return 0; |