Merge branch 'i2c-embedded/for-3.4' of git://git.pengutronix.de/git/wsa/linux

[~andy/linux] / net / ipv4 / tcp_timer.c

diff --git a/net/ipv4/tcp_timer.c b/net/ipv4/tcp_timer.c
index cd2e0723266d12b508569be0f4f6836cb21f94e7..34d4a02c2f16d867cb95827ee5ebc2256d0745b3 100644 (file)
--- a/net/ipv4/tcp_timer.c
+++ b/net/ipv4/tcp_timer.c
@@ -333,16 +333,18 @@ void tcp_retransmit_timer(struct sock *sk)
                 */
                struct inet_sock *inet = inet_sk(sk);
                if (sk->sk_family == AF_INET) {
-                       LIMIT_NETDEBUG(KERN_DEBUG "TCP: Peer %pI4:%u/%u unexpectedly shrunk window %u:%u (repaired)\n",
-                              &inet->inet_daddr, ntohs(inet->inet_dport),
-                              inet->inet_num, tp->snd_una, tp->snd_nxt);
+                       LIMIT_NETDEBUG(KERN_DEBUG pr_fmt("Peer %pI4:%u/%u unexpectedly shrunk window %u:%u (repaired)\n"),
+                                      &inet->inet_daddr,
+                                      ntohs(inet->inet_dport), inet->inet_num,
+                                      tp->snd_una, tp->snd_nxt);
                }
 #if IS_ENABLED(CONFIG_IPV6)
                else if (sk->sk_family == AF_INET6) {
                        struct ipv6_pinfo *np = inet6_sk(sk);
-                       LIMIT_NETDEBUG(KERN_DEBUG "TCP: Peer %pI6:%u/%u unexpectedly shrunk window %u:%u (repaired)\n",
-                              &np->daddr, ntohs(inet->inet_dport),
-                              inet->inet_num, tp->snd_una, tp->snd_nxt);
+                       LIMIT_NETDEBUG(KERN_DEBUG pr_fmt("Peer %pI6:%u/%u unexpectedly shrunk window %u:%u (repaired)\n"),
+                                      &np->daddr,
+                                      ntohs(inet->inet_dport), inet->inet_num,
+                                      tp->snd_una, tp->snd_nxt);
                }
 #endif
                if (tcp_time_stamp - tp->rcv_tstamp > TCP_RTO_MAX) {