projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Pull cpu-hotplug into release branch
[powerpc.git]
/
net
/
ipv4
/
tcp_hybla.c
diff --git
a/net/ipv4/tcp_hybla.c
b/net/ipv4/tcp_hybla.c
index
77add63
..
40dbb38
100644
(file)
--- 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;
}
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 (!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);
if (ca->rho == 0)
hybla_recalc_param(sk);