From 5c9ae2f32b08a2c449e82dd95b83d109d974dbe5 Mon Sep 17 00:00:00 2001 From: Thomas Young Date: Tue, 6 Dec 2005 16:17:11 -0800 Subject: [PATCH] --- yaml --- r: 15003 b: refs/heads/master c: 0d7bef600acab393898bd5553e167496587da3e1 h: refs/heads/master i: 15001: bf2d2bd69e7c61f720058b89eb21fc49bdad3765 14999: 223dff831291f1fa274aae39f2178151957f4535 v: v3 --- [refs] | 2 +- trunk/net/ipv4/tcp_vegas.c | 8 -------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 3e5aa61c8ca8..5ce615227d40 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5b4956138173cb8b58d83d3173360e8e681a2b66 +refs/heads/master: 0d7bef600acab393898bd5553e167496587da3e1 diff --git a/trunk/net/ipv4/tcp_vegas.c b/trunk/net/ipv4/tcp_vegas.c index 8f06a479305b..13e7e6e8df16 100644 --- a/trunk/net/ipv4/tcp_vegas.c +++ b/trunk/net/ipv4/tcp_vegas.c @@ -215,14 +215,6 @@ static void tcp_vegas_cong_avoid(struct sock *sk, u32 ack, vegas->beg_snd_nxt = tp->snd_nxt; vegas->beg_snd_cwnd = tp->snd_cwnd; - /* Take into account the current RTT sample too, to - * decrease the impact of delayed acks. This double counts - * this sample since we count it for the next window as well, - * but that's not too awful, since we're taking the min, - * rather than averaging. - */ - tcp_vegas_rtt_calc(sk, seq_rtt * 1000); - /* We do the Vegas calculations only if we got enough RTT * samples that we can be reasonably sure that we got * at least one RTT sample that wasn't from a delayed ACK.