diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-15 16:59:38 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-15 16:59:38 -0800 |
| commit | f6ff56cd56b83d8edf4b3cffc5c53c56b37a5081 (patch) | |
| tree | 0ec4807d49a602ba785e60e5352b542f1581d4c9 /net/ipv4/tcp_input.c | |
| parent | fb6d73d3014babb69f5cc2d1d78b31e9d09fc5df (diff) | |
| parent | 5a6f294e43e432bd207a702fea49ebb303ef9b23 (diff) | |
| download | talos-op-linux-f6ff56cd56b83d8edf4b3cffc5c53c56b37a5081.tar.gz talos-op-linux-f6ff56cd56b83d8edf4b3cffc5c53c56b37a5081.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
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 40a26b7157b4..bf2e23086bce 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) |
