Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

1 files changed, 3 insertions, 3 deletions

diff --git a/net/ipv4/tcp_hybla.c b/net/ipv4/tcp_hybla.c
index 77add63623df..40dbb3877510 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);