X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=net%2Fipv4%2Ftcp_hybla.c;h=7406e0c5fb8e45d85a18bc956accd781221944d0;hb=e54f48933f414fa447c26d16524a4c9a8e2facc6;hp=77add63623df2a1034a21bfdb6fbaddf82385a71;hpb=b25dd2842bcaef2413db7a06c67034b187aa007f;p=linux-2.6 diff --git a/net/ipv4/tcp_hybla.c b/net/ipv4/tcp_hybla.c index 77add63623..7406e0c5fb 100644 --- a/net/ipv4/tcp_hybla.c +++ b/net/ipv4/tcp_hybla.c @@ -10,7 +10,6 @@ * root at danielinux.net */ -#include #include #include @@ -100,12 +99,12 @@ static void hybla_cong_avoid(struct sock *sk, u32 ack, u32 rtt, ca->minrtt = tp->srtt; } + if (!tcp_is_cwnd_limited(sk, in_flight)) + return; + if (!ca->hybla_en) return tcp_reno_cong_avoid(sk, ack, rtt, in_flight, flag); - if (in_flight < tp->snd_cwnd) - return; - if (ca->rho == 0) hybla_recalc_param(sk);