X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;ds=sidebyside;f=net%2Fipv4%2Ftcp_hybla.c;h=40dbb38775101c02b4c285b887f13d1ff0aecebb;hb=61fb46c5b3578fda7cc780e8bc53b3e8f8c1a143;hp=77add63623df2a1034a21bfdb6fbaddf82385a71;hpb=129521dcc94f781890f8f668219ab79f0073ff9f;p=powerpc.git diff --git a/net/ipv4/tcp_hybla.c b/net/ipv4/tcp_hybla.c index 77add63623..40dbb38775 100644 --- a/net/ipv4/tcp_hybla.c +++ b/net/ipv4/tcp_hybla.c @@ -100,12 +100,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);