diff options
author | Neal Cardwell <ncardwell@google.com> | 2015-02-20 13:33:16 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-02-22 23:07:11 -0500 |
commit | 6514890f7aa8dd75fa46e282a1c7a8615e86f363 (patch) | |
tree | 8a6f3b84e190d48fa39c1921768fd08ce1e5d658 /net | |
parent | 52d6c8c6ca125872459054daa70f2f1c698c8e75 (diff) | |
download | linux-stable-6514890f7aa8dd75fa46e282a1c7a8615e86f363.tar.gz linux-stable-6514890f7aa8dd75fa46e282a1c7a8615e86f363.tar.bz2 linux-stable-6514890f7aa8dd75fa46e282a1c7a8615e86f363.zip |
tcp: fix tcp_should_expand_sndbuf() to use tcp_packets_in_flight()
tcp_should_expand_sndbuf() does not expand the send buffer if we have
filled the congestion window.
However, it should use tcp_packets_in_flight() instead of
tp->packets_out to make this check.
Testing has established that the difference matters a lot if there are
many SACKed packets, causing a needless performance shortfall.
Signed-off-by: Neal Cardwell <ncardwell@google.com>
Signed-off-by: Yuchung Cheng <ycheng@google.com>
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: Nandita Dukkipati <nanditad@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-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; |