diff options
author | Stephen Hemminger <shemminger@linux-foundation.org> | 2007-07-16 21:35:52 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-07-18 04:46:58 -0400 |
commit | 16751347a060a10c09b11593bb179fd5b0240c04 (patch) | |
tree | 40399ba217d9e4c45060c4d12334c53f931ca635 /net/ipv4/tcp_vegas.c | |
parent | 44beac008631d1b8a52f103e04eacba2bda81511 (diff) |
[TCP]: remove unused argument to cong_avoid op
None of the existing TCP congestion controls use the rtt value pased
in the ca_ops->cong_avoid interface. Which is lucky because seq_rtt
could have been -1 when handling a duplicate ack.
Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/tcp_vegas.c')
-rw-r--r-- | net/ipv4/tcp_vegas.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/ipv4/tcp_vegas.c b/net/ipv4/tcp_vegas.c index e218a51ceced..914e0307f7af 100644 --- a/net/ipv4/tcp_vegas.c +++ b/net/ipv4/tcp_vegas.c | |||
@@ -163,13 +163,13 @@ void tcp_vegas_cwnd_event(struct sock *sk, enum tcp_ca_event event) | |||
163 | EXPORT_SYMBOL_GPL(tcp_vegas_cwnd_event); | 163 | EXPORT_SYMBOL_GPL(tcp_vegas_cwnd_event); |
164 | 164 | ||
165 | static void tcp_vegas_cong_avoid(struct sock *sk, u32 ack, | 165 | static void tcp_vegas_cong_avoid(struct sock *sk, u32 ack, |
166 | u32 seq_rtt, u32 in_flight, int flag) | 166 | u32 in_flight, int flag) |
167 | { | 167 | { |
168 | struct tcp_sock *tp = tcp_sk(sk); | 168 | struct tcp_sock *tp = tcp_sk(sk); |
169 | struct vegas *vegas = inet_csk_ca(sk); | 169 | struct vegas *vegas = inet_csk_ca(sk); |
170 | 170 | ||
171 | if (!vegas->doing_vegas_now) | 171 | if (!vegas->doing_vegas_now) |
172 | return tcp_reno_cong_avoid(sk, ack, seq_rtt, in_flight, flag); | 172 | return tcp_reno_cong_avoid(sk, ack, in_flight, flag); |
173 | 173 | ||
174 | /* The key players are v_beg_snd_una and v_beg_snd_nxt. | 174 | /* The key players are v_beg_snd_una and v_beg_snd_nxt. |
175 | * | 175 | * |
@@ -228,7 +228,7 @@ static void tcp_vegas_cong_avoid(struct sock *sk, u32 ack, | |||
228 | /* We don't have enough RTT samples to do the Vegas | 228 | /* We don't have enough RTT samples to do the Vegas |
229 | * calculation, so we'll behave like Reno. | 229 | * calculation, so we'll behave like Reno. |
230 | */ | 230 | */ |
231 | tcp_reno_cong_avoid(sk, ack, seq_rtt, in_flight, flag); | 231 | tcp_reno_cong_avoid(sk, ack, in_flight, flag); |
232 | } else { | 232 | } else { |
233 | u32 rtt, target_cwnd, diff; | 233 | u32 rtt, target_cwnd, diff; |
234 | 234 | ||