diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-10-11 23:33:37 +0200 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-10-11 23:33:37 +0200 |
| commit | 16d185eee470cf2dc3e909a59132893abfdd4b11 (patch) | |
| tree | e48bdb15a5e30feb76a3eed812054b836166b2b5 /net/ipv4/tcp_yeah.c | |
| parent | 0a9cbce798bca52bb3476cb55ce33da27e100f3e (diff) | |
| parent | be2a76aecfc5ed58ddf8925190cc1cfb519bf932 (diff) | |
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
Conflicts:
kernel/cpuset.c
Diffstat (limited to 'net/ipv4/tcp_yeah.c')
| -rw-r--r-- | net/ipv4/tcp_yeah.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/tcp_yeah.c b/net/ipv4/tcp_yeah.c index 3e6a472e6b88..92ab5bc91592 100644 --- a/net/ipv4/tcp_yeah.c +++ b/net/ipv4/tcp_yeah.c @@ -75,7 +75,7 @@ static void tcp_yeah_cong_avoid(struct sock *sk, u32 ack, u32 acked) if (!tcp_is_cwnd_limited(sk)) return; - if (tp->snd_cwnd <= tp->snd_ssthresh) + if (tcp_in_slow_start(tp)) tcp_slow_start(tp, acked); else if (!yeah->doing_reno_now) { |