aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4/tcp_vegas.c
diff options
context:
space:
mode:
authorIlpo Järvinen <ilpo.jarvinen@helsinki.fi>2007-12-01 17:47:59 -0500
committerDavid S. Miller <davem@davemloft.net>2008-01-28 17:55:41 -0500
commitc3a05c6050a339c92e49fae0ba77dbba0d41fd99 (patch)
tree4bc4e003d522cc748aceb7478f86c043e382ad8e /net/ipv4/tcp_vegas.c
parentede9f3b186bc3eb0fce084bdcab500efc3721a80 (diff)
[TCP]: Cong.ctrl modules: remove unused good_ack from cong_avoid
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/tcp_vegas.c')
-rw-r--r--net/ipv4/tcp_vegas.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/net/ipv4/tcp_vegas.c b/net/ipv4/tcp_vegas.c
index 007304e99842..be24d6ee34bd 100644
--- a/net/ipv4/tcp_vegas.c
+++ b/net/ipv4/tcp_vegas.c
@@ -162,14 +162,13 @@ void tcp_vegas_cwnd_event(struct sock *sk, enum tcp_ca_event event)
162} 162}
163EXPORT_SYMBOL_GPL(tcp_vegas_cwnd_event); 163EXPORT_SYMBOL_GPL(tcp_vegas_cwnd_event);
164 164
165static void tcp_vegas_cong_avoid(struct sock *sk, u32 ack, 165static void tcp_vegas_cong_avoid(struct sock *sk, u32 ack, u32 in_flight)
166 u32 in_flight, int flag)
167{ 166{
168 struct tcp_sock *tp = tcp_sk(sk); 167 struct tcp_sock *tp = tcp_sk(sk);
169 struct vegas *vegas = inet_csk_ca(sk); 168 struct vegas *vegas = inet_csk_ca(sk);
170 169
171 if (!vegas->doing_vegas_now) 170 if (!vegas->doing_vegas_now)
172 return tcp_reno_cong_avoid(sk, ack, in_flight, flag); 171 return tcp_reno_cong_avoid(sk, ack, in_flight);
173 172
174 /* The key players are v_beg_snd_una and v_beg_snd_nxt. 173 /* The key players are v_beg_snd_una and v_beg_snd_nxt.
175 * 174 *
@@ -228,7 +227,7 @@ static void tcp_vegas_cong_avoid(struct sock *sk, u32 ack,
228 /* We don't have enough RTT samples to do the Vegas 227 /* We don't have enough RTT samples to do the Vegas
229 * calculation, so we'll behave like Reno. 228 * calculation, so we'll behave like Reno.
230 */ 229 */
231 tcp_reno_cong_avoid(sk, ack, in_flight, flag); 230 tcp_reno_cong_avoid(sk, ack, in_flight);
232 } else { 231 } else {
233 u32 rtt, target_cwnd, diff; 232 u32 rtt, target_cwnd, diff;
234 233