diff options
| author | Rob Herring <robh@kernel.org> | 2015-03-10 15:03:04 +0100 |
|---|---|---|
| committer | Rob Herring <robh@kernel.org> | 2015-03-10 15:03:04 +0100 |
| commit | 2c192699a7050ef5bdf1e2cc95fdddfbcf524509 (patch) | |
| tree | 945d4553691ecb24151a2fa83b7d489665dd3248 /net/ipv4/tcp_input.c | |
| parent | serial: add device tree binding documentation for ETRAX FS UART (diff) | |
| parent | Linux 4.0-rc3 (diff) | |
| download | linux-2c192699a7050ef5bdf1e2cc95fdddfbcf524509.tar.xz linux-2c192699a7050ef5bdf1e2cc95fdddfbcf524509.zip | |
Merge tag 'v4.0-rc3' into HEAD
Linux 4.0-rc3
Merging in v4.0-rc3 because commit 30a22c215a00 (console: Fix
console name size mismatch) is a dependency.
Diffstat (limited to 'net/ipv4/tcp_input.c')
| -rw-r--r-- | net/ipv4/tcp_input.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index 8fdd27b17306..fb4cf8b8e121 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c @@ -4770,7 +4770,7 @@ static bool tcp_should_expand_sndbuf(const struct sock *sk) return false; /* If we filled the congestion window, do not expand. */ - if (tp->packets_out >= tp->snd_cwnd) + if (tcp_packets_in_flight(tp) >= tp->snd_cwnd) return false; return true; |