diff options
| author | Mark Brown <[email protected]> | 2015-10-12 18:09:27 +0100 | 
|---|---|---|
| committer | Mark Brown <[email protected]> | 2015-10-12 18:09:27 +0100 | 
| commit | 79828b4fa835f73cdaf4bffa48696abdcbea9d02 (patch) | |
| tree | 5e0fa7156acb75ba603022bc807df8f2fedb97a8 /net/ipv4/tcp_cdg.c | |
| parent | 721b51fcf91898299d96f4b72cb9434cda29dce6 (diff) | |
| parent | 8c1a9d6323abf0fb1e5dad96cf3f1c783505ea5a (diff) | |
Merge remote-tracking branch 'asoc/fix/rt5645' into asoc-fix-rt5645
Diffstat (limited to 'net/ipv4/tcp_cdg.c')
| -rw-r--r-- | net/ipv4/tcp_cdg.c | 2 | 
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/tcp_cdg.c b/net/ipv4/tcp_cdg.c index 8c6fd3d5e40f..167b6a3e1b98 100644 --- a/net/ipv4/tcp_cdg.c +++ b/net/ipv4/tcp_cdg.c @@ -264,7 +264,7 @@ static void tcp_cdg_cong_avoid(struct sock *sk, u32 ack, u32 acked)  	u32 prior_snd_cwnd;  	u32 incr; -	if (tp->snd_cwnd < tp->snd_ssthresh && hystart_detect) +	if (tcp_in_slow_start(tp) && hystart_detect)  		tcp_cdg_hystart_update(sk);  	if (after(ack, ca->rtt_seq) && ca->rtt.v64) {  |