summaryrefslogtreecommitdiff
path: root/net/ipv4/tcp_input.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-03-11 15:53:25 +0300
committerMark Brown <broonie@kernel.org>2015-03-11 15:53:25 +0300
commit11dd60447e3b1018f9cae66737cb902b519d3454 (patch)
treea33d8bcb18a3becae2161aa215c25d5674626c57 /net/ipv4/tcp_input.c
parent8d0c38a3f2a6bb70e952f127ed817fc7a08db52c (diff)
parent9eccca0843205f87c00404b663188b88eb248051 (diff)
downloadlinux-11dd60447e3b1018f9cae66737cb902b519d3454.tar.xz
Merge tag 'v4.0-rc3' into asoc-intel
Linux 4.0-rc3
Diffstat (limited to 'net/ipv4/tcp_input.c')
-rw-r--r--net/ipv4/tcp_input.c2
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;