diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-08-18 12:33:29 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-08-18 12:33:29 +0800 |
| commit | e779279da78339ec75fa72571ef901a447762cc6 (patch) | |
| tree | 6153fe0215590a435a1f84e5ddd6d84e15edadf1 /net/ipv4/tcp_output.c | |
| parent | 21a48ffe4dff2194cceeecad0436d920c267027c (diff) | |
| parent | e4884275a4bb1cbce5a24a507c3e267c887dc1bd (diff) | |
Merge tag 'v4.4.18' into linux-linaro-lsk-v4.4
This is the 4.4.18 stable release
Diffstat (limited to 'net/ipv4/tcp_output.c')
| -rw-r--r-- | net/ipv4/tcp_output.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c index 7c9883ab56e5..660c967ba84a 100644 --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c @@ -239,7 +239,8 @@ void tcp_select_initial_window(int __space, __u32 mss, /* Set window scaling on max possible window * See RFC1323 for an explanation of the limit to 14 */ - space = max_t(u32, sysctl_tcp_rmem[2], sysctl_rmem_max); + space = max_t(u32, space, sysctl_tcp_rmem[2]); + space = max_t(u32, space, sysctl_rmem_max); space = min_t(u32, space, *window_clamp); while (space > 65535 && (*rcv_wscale) < 14) { space >>= 1; |