diff options
author | Mark Brown <broonie@kernel.org> | 2018-06-27 14:26:12 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2018-06-27 14:26:12 +0100 |
commit | 1ce34dea91ae86bb18f493f72292df1bf6f66df7 (patch) | |
tree | a9655fcdd65c2068cc04ffe3562a9c710dfa2145 /net/ipv4/tcp_input.c | |
parent | b0e4376b34cab1cbbd7ed399a1df787890336837 (diff) | |
parent | a26899e0baa4de07caf97f5e4d7298240e98fd0e (diff) |
Merge tag 'v4.14.52' into linux-linaro-lsk-v4.14lsk-v4.14-18.06
This is the 4.14.52 stable release
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 125b49c166a4..f0caff3139ed 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c @@ -647,7 +647,7 @@ void tcp_rcv_space_adjust(struct sock *sk) sk->sk_rcvbuf = rcvbuf; /* Make the window clamp follow along. */ - tp->window_clamp = rcvwin; + tp->window_clamp = tcp_win_from_space(rcvbuf); } } tp->rcvq_space.space = copied; |