diff options
author | Thomas Young <tyo@ee.mu.oz.au> | 2005-12-06 19:17:11 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2005-12-06 19:17:11 -0500 |
commit | 0d7bef600acab393898bd5553e167496587da3e1 (patch) | |
tree | eef994f627b324e0e774a6ba2a5537b35e46c819 /net | |
parent | 5b4956138173cb8b58d83d3173360e8e681a2b66 (diff) |
[TCP] Vegas: Remove extra call to tcp_vegas_rtt_calc
Remove unneeded call to tcp_vegas_rtt_calc. The more accurate
microsecond value has already been registered prior to calling
tcp_vegas_cong_avoid.
Signed-off-by: Thomas Young <tyo@ee.mu.oz.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r-- | net/ipv4/tcp_vegas.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/net/ipv4/tcp_vegas.c b/net/ipv4/tcp_vegas.c index 8f06a479305b..13e7e6e8df16 100644 --- a/net/ipv4/tcp_vegas.c +++ b/net/ipv4/tcp_vegas.c | |||
@@ -215,14 +215,6 @@ static void tcp_vegas_cong_avoid(struct sock *sk, u32 ack, | |||
215 | vegas->beg_snd_nxt = tp->snd_nxt; | 215 | vegas->beg_snd_nxt = tp->snd_nxt; |
216 | vegas->beg_snd_cwnd = tp->snd_cwnd; | 216 | vegas->beg_snd_cwnd = tp->snd_cwnd; |
217 | 217 | ||
218 | /* Take into account the current RTT sample too, to | ||
219 | * decrease the impact of delayed acks. This double counts | ||
220 | * this sample since we count it for the next window as well, | ||
221 | * but that's not too awful, since we're taking the min, | ||
222 | * rather than averaging. | ||
223 | */ | ||
224 | tcp_vegas_rtt_calc(sk, seq_rtt * 1000); | ||
225 | |||
226 | /* We do the Vegas calculations only if we got enough RTT | 218 | /* We do the Vegas calculations only if we got enough RTT |
227 | * samples that we can be reasonably sure that we got | 219 | * samples that we can be reasonably sure that we got |
228 | * at least one RTT sample that wasn't from a delayed ACK. | 220 | * at least one RTT sample that wasn't from a delayed ACK. |