| Message ID | 1229658561.3726.602.camel@calx |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
From: Matt Mackall <mpm@selenic.com> Date: Thu, 18 Dec 2008 21:49:21 -0600 > On Thu, 2008-12-18 at 16:15 -0800, David Miller wrote: > > From: Matt Mackall <mpm@selenic.com> > > Date: Thu, 18 Dec 2008 17:50:34 -0600 > > > > > If you want, we can instead say "Peer %d unexpectedly shrunk window...". > > > So long as the scary bit is gone, I don't care. > > > > Since we have established that the blame is equally possible to > > be the local as the remote system, something like: > > > > TCP: Unexpected shrink of advertised window detected ... > > > > is probably the best. > > How's this: > > The original message was unhelpful and extremely alarming to our poor > users, despite its charm. Make it less frightening. > > Signed-off-by: Matt Mackall <mpm@selenic.com> Looks good, applied, thanks Matt. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/ipv4/tcp_timer.c b/net/ipv4/tcp_timer.c index cc4e6d2..0170e91 100644 --- a/net/ipv4/tcp_timer.c +++ b/net/ipv4/tcp_timer.c @@ -299,14 +299,14 @@ static void tcp_retransmit_timer(struct sock *sk) #ifdef TCP_DEBUG struct inet_sock *inet = inet_sk(sk); if (sk->sk_family == AF_INET) { - LIMIT_NETDEBUG(KERN_DEBUG "TCP: Treason uncloaked! Peer %pI4:%u/%u shrinks window %u:%u. Repaired.\n", + LIMIT_NETDEBUG(KERN_DEBUG "TCP: Peer %pI4:%u/%u unexpectedly shrunk window %u:%u (repaired)\n", &inet->daddr, ntohs(inet->dport), inet->num, tp->snd_una, tp->snd_nxt); } #if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) else if (sk->sk_family == AF_INET6) { struct ipv6_pinfo *np = inet6_sk(sk); - LIMIT_NETDEBUG(KERN_DEBUG "TCP: Treason uncloaked! Peer %pI6:%u/%u shrinks window %u:%u. Repaired.\n", + LIMIT_NETDEBUG(KERN_DEBUG "TCP: Peer %pI6:%u/%u unexpectedly shrunk window %u:%u (repaired)\n", &np->daddr, ntohs(inet->dport), inet->num, tp->snd_una, tp->snd_nxt); }