diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-18 13:23:21 -0500 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-18 13:23:21 -0500 |
commit | 638cbac8de9b57345a9446e107b6aebc10b58970 (patch) | |
tree | e445fe3a1b8ad718d7ee770ed1c7a43e3eb5a611 /net/ipv4/tcp_input.c | |
parent | f055408957750cf759162c364c2a4dfe19765844 (diff) | |
parent | fc71fe40d2bedcc57d3406bf2050481f8b3441b6 (diff) | |
download | op-kernel-dev-638cbac8de9b57345a9446e107b6aebc10b58970.zip op-kernel-dev-638cbac8de9b57345a9446e107b6aebc10b58970.tar.gz |
Merge branch 'master'
Diffstat (limited to 'net/ipv4/tcp_input.c')
-rw-r--r-- | net/ipv4/tcp_input.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index 40a26b7..bf2e230 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c @@ -367,7 +367,7 @@ static void tcp_rcv_rtt_update(struct tcp_sock *tp, u32 sample, int win_dep) * are stalled on filesystem I/O. * * Also, since we are only going for a minimum in the - * non-timestamp case, we do not smoother things out + * non-timestamp case, we do not smooth things out * else with timestamps disabled convergence takes too * long. */ @@ -546,7 +546,7 @@ static void tcp_rtt_estimator(struct sock *sk, const __u32 mrtt) * * Funny. This algorithm seems to be very broken. * These formulae increase RTO, when it should be decreased, increase - * too slowly, when it should be increased fastly, decrease too fastly + * too slowly, when it should be increased quickly, decrease too quickly * etc. I guess in BSD RTO takes ONE value, so that it is absolutely * does not matter how to _calculate_ it. Seems, it was trap * that VJ failed to avoid. 8) |