diff options
| author |   Eric Dumazet <edumazet@google.com> | 2014-05-02 21:18:05 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2014-05-03 19:23:07 -0400 |
| commit | 249015515fe3fc9818d86cb5c83bbc92505ad7dc (patch) | |
| tree | 98db6ccb0d19abccf3c0745551ee1bc5a8076fb3 /net/ipv4/tcp_hybla.c | |
| parent | tcp: fix cwnd limited checking to improve congestion control (diff) | |
| download | wireguard-linux-249015515fe3fc9818d86cb5c83bbc92505ad7dc.tar.xz wireguard-linux-249015515fe3fc9818d86cb5c83bbc92505ad7dc.zip | |
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_hybla.c')
| -rw-r--r-- | net/ipv4/tcp_hybla.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/net/ipv4/tcp_hybla.c b/net/ipv4/tcp_hybla.c index a15a799bf768..d8f8f05a4951 100644 --- a/net/ipv4/tcp_hybla.c +++ b/net/ipv4/tcp_hybla.c @@ -87,8 +87,7 @@ static inline u32 hybla_fraction(u32 odds) * o Give cwnd a new value based on the model proposed * o remember increments <1 */ -static void hybla_cong_avoid(struct sock *sk, u32 ack, u32 acked, - u32 in_flight) +static void hybla_cong_avoid(struct sock *sk, u32 ack, u32 acked) { struct tcp_sock *tp = tcp_sk(sk); struct hybla *ca = inet_csk_ca(sk); @@ -101,11 +100,11 @@ static void hybla_cong_avoid(struct sock *sk, u32 ack, u32 acked, ca->minrtt_us = tp->srtt_us; } - if (!tcp_is_cwnd_limited(sk, in_flight)) + if (!tcp_is_cwnd_limited(sk)) return; if (!ca->hybla_en) { - tcp_reno_cong_avoid(sk, ack, acked, in_flight); + tcp_reno_cong_avoid(sk, ack, acked); return; } |