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_veno.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_veno.c')
-rw-r--r-- | net/ipv4/tcp_veno.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/ipv4/tcp_veno.c b/net/ipv4/tcp_veno.c index ec854cc5fad..7a55ddf8603 100644 --- a/net/ipv4/tcp_veno.c +++ b/net/ipv4/tcp_veno.c | |||
@@ -115,13 +115,13 @@ static void tcp_veno_cwnd_event(struct sock *sk, enum tcp_ca_event event) | |||
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, |
118 | u32 seq_rtt, u32 in_flight, int flag) | 118 | u32 in_flight, int flag) |
119 | { | 119 | { |
120 | struct tcp_sock *tp = tcp_sk(sk); | 120 | struct tcp_sock *tp = tcp_sk(sk); |
121 | struct veno *veno = inet_csk_ca(sk); | 121 | struct veno *veno = inet_csk_ca(sk); |
122 | 122 | ||
123 | if (!veno->doing_veno_now) | 123 | if (!veno->doing_veno_now) |
124 | return tcp_reno_cong_avoid(sk, ack, seq_rtt, in_flight, flag); | 124 | return tcp_reno_cong_avoid(sk, ack, in_flight, flag); |
125 | 125 | ||
126 | /* limited by applications */ | 126 | /* limited by applications */ |
127 | if (!tcp_is_cwnd_limited(sk, in_flight)) | 127 | if (!tcp_is_cwnd_limited(sk, in_flight)) |
@@ -132,7 +132,7 @@ static void tcp_veno_cong_avoid(struct sock *sk, u32 ack, | |||
132 | /* We don't have enough rtt samples to do the Veno | 132 | /* We don't have enough rtt samples to do the Veno |
133 | * calculation, so we'll behave like Reno. | 133 | * calculation, so we'll behave like Reno. |
134 | */ | 134 | */ |
135 | tcp_reno_cong_avoid(sk, ack, seq_rtt, in_flight, flag); | 135 | tcp_reno_cong_avoid(sk, ack, in_flight, flag); |
136 | } else { | 136 | } else { |
137 | u32 rtt, target_cwnd; | 137 | u32 rtt, target_cwnd; |
138 | 138 | ||