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_htcp.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_htcp.c')
-rw-r--r-- | net/ipv4/tcp_htcp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/tcp_htcp.c b/net/ipv4/tcp_htcp.c index 4a194acfd923..031361311a8b 100644 --- a/net/ipv4/tcp_htcp.c +++ b/net/ipv4/tcp_htcp.c | |||
@@ -227,12 +227,12 @@ static u32 htcp_recalc_ssthresh(struct sock *sk) | |||
227 | return max((tp->snd_cwnd * ca->beta) >> 7, 2U); | 227 | return max((tp->snd_cwnd * ca->beta) >> 7, 2U); |
228 | } | 228 | } |
229 | 229 | ||
230 | static void htcp_cong_avoid(struct sock *sk, u32 ack, u32 acked, u32 in_flight) | 230 | static void htcp_cong_avoid(struct sock *sk, u32 ack, u32 acked) |
231 | { | 231 | { |
232 | struct tcp_sock *tp = tcp_sk(sk); | 232 | struct tcp_sock *tp = tcp_sk(sk); |
233 | struct htcp *ca = inet_csk_ca(sk); | 233 | struct htcp *ca = inet_csk_ca(sk); |
234 | 234 | ||
235 | if (!tcp_is_cwnd_limited(sk, in_flight)) | 235 | if (!tcp_is_cwnd_limited(sk)) |
236 | return; | 236 | return; |
237 | 237 | ||
238 | if (tp->snd_cwnd <= tp->snd_ssthresh) | 238 | if (tp->snd_cwnd <= tp->snd_ssthresh) |