diff options
author | Ilpo Järvinen <ilpo.jarvinen@helsinki.fi> | 2007-12-01 17:47:59 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-01-28 17:55:41 -0500 |
commit | c3a05c6050a339c92e49fae0ba77dbba0d41fd99 (patch) | |
tree | 4bc4e003d522cc748aceb7478f86c043e382ad8e /net/ipv4/tcp_veno.c | |
parent | ede9f3b186bc3eb0fce084bdcab500efc3721a80 (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_veno.c')
-rw-r--r-- | net/ipv4/tcp_veno.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/net/ipv4/tcp_veno.c b/net/ipv4/tcp_veno.c index 8fb2aee0b1a4..d16689e98516 100644 --- a/net/ipv4/tcp_veno.c +++ b/net/ipv4/tcp_veno.c | |||
@@ -114,14 +114,13 @@ static void tcp_veno_cwnd_event(struct sock *sk, enum tcp_ca_event event) | |||
114 | tcp_veno_init(sk); | 114 | tcp_veno_init(sk); |
115 | } | 115 | } |
116 | 116 | ||
117 | static void tcp_veno_cong_avoid(struct sock *sk, u32 ack, | 117 | static void tcp_veno_cong_avoid(struct sock *sk, u32 ack, u32 in_flight) |
118 | u32 in_flight, int flag) | ||
119 | { | 118 | { |
120 | struct tcp_sock *tp = tcp_sk(sk); | 119 | struct tcp_sock *tp = tcp_sk(sk); |
121 | struct veno *veno = inet_csk_ca(sk); | 120 | struct veno *veno = inet_csk_ca(sk); |
122 | 121 | ||
123 | if (!veno->doing_veno_now) | 122 | if (!veno->doing_veno_now) |
124 | return tcp_reno_cong_avoid(sk, ack, in_flight, flag); | 123 | return tcp_reno_cong_avoid(sk, ack, in_flight); |
125 | 124 | ||
126 | /* limited by applications */ | 125 | /* limited by applications */ |
127 | if (!tcp_is_cwnd_limited(sk, in_flight)) | 126 | if (!tcp_is_cwnd_limited(sk, in_flight)) |
@@ -132,7 +131,7 @@ static void tcp_veno_cong_avoid(struct sock *sk, u32 ack, | |||
132 | /* We don't have enough rtt samples to do the Veno | 131 | /* We don't have enough rtt samples to do the Veno |
133 | * calculation, so we'll behave like Reno. | 132 | * calculation, so we'll behave like Reno. |
134 | */ | 133 | */ |
135 | tcp_reno_cong_avoid(sk, ack, in_flight, flag); | 134 | tcp_reno_cong_avoid(sk, ack, in_flight); |
136 | } else { | 135 | } else { |
137 | u32 rtt, target_cwnd; | 136 | u32 rtt, target_cwnd; |
138 | 137 | ||