diff options
author | Joe Perches <joe@perches.com> | 2012-03-12 03:03:32 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-03-12 20:05:21 -0400 |
commit | afd465030acb4098abcb6b965a5aebc7ea2209e0 (patch) | |
tree | 59c93e8eda99cd59339dfbb77f1d2c4f79c634ee /net/ipv4/tcp_timer.c | |
parent | 058bd4d2a4ff0aaa4a5381c67e776729d840c785 (diff) |
net: ipv4: Standardize prefixes for message logging
Add #define pr_fmt(fmt) as appropriate.
Add "IPv4: ", "TCP: ", and "IPsec: " to appropriate files.
Standardize on "UDPLite: " for appropriate uses.
Some prefixes were previously "UDPLITE: " and "UDP-Lite: ".
Add KBUILD_MODNAME ": " to icmp and gre.
Remove embedded prefixes as appropriate.
Add missing "\n" to pr_info in gre.c.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/tcp_timer.c')
-rw-r--r-- | net/ipv4/tcp_timer.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/net/ipv4/tcp_timer.c b/net/ipv4/tcp_timer.c index cd2e0723266d..34d4a02c2f16 100644 --- a/net/ipv4/tcp_timer.c +++ b/net/ipv4/tcp_timer.c | |||
@@ -333,16 +333,18 @@ void tcp_retransmit_timer(struct sock *sk) | |||
333 | */ | 333 | */ |
334 | struct inet_sock *inet = inet_sk(sk); | 334 | struct inet_sock *inet = inet_sk(sk); |
335 | if (sk->sk_family == AF_INET) { | 335 | if (sk->sk_family == AF_INET) { |
336 | LIMIT_NETDEBUG(KERN_DEBUG "TCP: Peer %pI4:%u/%u unexpectedly shrunk window %u:%u (repaired)\n", | 336 | LIMIT_NETDEBUG(KERN_DEBUG pr_fmt("Peer %pI4:%u/%u unexpectedly shrunk window %u:%u (repaired)\n"), |
337 | &inet->inet_daddr, ntohs(inet->inet_dport), | 337 | &inet->inet_daddr, |
338 | inet->inet_num, tp->snd_una, tp->snd_nxt); | 338 | ntohs(inet->inet_dport), inet->inet_num, |
339 | tp->snd_una, tp->snd_nxt); | ||
339 | } | 340 | } |
340 | #if IS_ENABLED(CONFIG_IPV6) | 341 | #if IS_ENABLED(CONFIG_IPV6) |
341 | else if (sk->sk_family == AF_INET6) { | 342 | else if (sk->sk_family == AF_INET6) { |
342 | struct ipv6_pinfo *np = inet6_sk(sk); | 343 | struct ipv6_pinfo *np = inet6_sk(sk); |
343 | LIMIT_NETDEBUG(KERN_DEBUG "TCP: Peer %pI6:%u/%u unexpectedly shrunk window %u:%u (repaired)\n", | 344 | LIMIT_NETDEBUG(KERN_DEBUG pr_fmt("Peer %pI6:%u/%u unexpectedly shrunk window %u:%u (repaired)\n"), |
344 | &np->daddr, ntohs(inet->inet_dport), | 345 | &np->daddr, |
345 | inet->inet_num, tp->snd_una, tp->snd_nxt); | 346 | ntohs(inet->inet_dport), inet->inet_num, |
347 | tp->snd_una, tp->snd_nxt); | ||
346 | } | 348 | } |
347 | #endif | 349 | #endif |
348 | if (tcp_time_stamp - tp->rcv_tstamp > TCP_RTO_MAX) { | 350 | if (tcp_time_stamp - tp->rcv_tstamp > TCP_RTO_MAX) { |