diff options
author | Eric Dumazet <edumazet@google.com> | 2014-05-03 00:18:05 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-05-03 19:23:07 -0400 |
commit | 249015515fe3fc9818d86cb5c83bbc92505ad7dc (patch) | |
tree | 98db6ccb0d19abccf3c0745551ee1bc5a8076fb3 /net/ipv4/tcp_illinois.c | |
parent | e114a710aa5058c0ba4aa1dfb105132aefeb5e04 (diff) |
tcp: remove in_flight parameter from cong_avoid() methods
Commit e114a710aa505 ("tcp: fix cwnd limited checking to improve
congestion control") obsoleted in_flight parameter from
tcp_is_cwnd_limited() and its callers.
This patch does the removal as promised.
Signed-off-by: Eric Dumazet <edumazet@google.com>
Acked-by: Neal Cardwell <ncardwell@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/tcp_illinois.c')
-rw-r--r-- | net/ipv4/tcp_illinois.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/net/ipv4/tcp_illinois.c b/net/ipv4/tcp_illinois.c index 863d105e3015..5999b3972e64 100644 --- a/net/ipv4/tcp_illinois.c +++ b/net/ipv4/tcp_illinois.c | |||
@@ -255,8 +255,7 @@ static void tcp_illinois_state(struct sock *sk, u8 new_state) | |||
255 | /* | 255 | /* |
256 | * Increase window in response to successful acknowledgment. | 256 | * Increase window in response to successful acknowledgment. |
257 | */ | 257 | */ |
258 | static void tcp_illinois_cong_avoid(struct sock *sk, u32 ack, u32 acked, | 258 | static void tcp_illinois_cong_avoid(struct sock *sk, u32 ack, u32 acked) |
259 | u32 in_flight) | ||
260 | { | 259 | { |
261 | struct tcp_sock *tp = tcp_sk(sk); | 260 | struct tcp_sock *tp = tcp_sk(sk); |
262 | struct illinois *ca = inet_csk_ca(sk); | 261 | struct illinois *ca = inet_csk_ca(sk); |
@@ -265,7 +264,7 @@ static void tcp_illinois_cong_avoid(struct sock *sk, u32 ack, u32 acked, | |||
265 | update_params(sk); | 264 | update_params(sk); |
266 | 265 | ||
267 | /* RFC2861 only increase cwnd if fully utilized */ | 266 | /* RFC2861 only increase cwnd if fully utilized */ |
268 | if (!tcp_is_cwnd_limited(sk, in_flight)) | 267 | if (!tcp_is_cwnd_limited(sk)) |
269 | return; | 268 | return; |
270 | 269 | ||
271 | /* In slow start */ | 270 | /* In slow start */ |