diff options
| author | Andrew Morton <akpm@linux-foundation.org> | 2022-08-25 21:45:38 -0700 |
|---|---|---|
| committer | Andrew Morton <akpm@linux-foundation.org> | 2022-08-25 21:45:38 -0700 |
| commit | ec6624452e36158d0813758d837f7a2263a4109d (patch) | |
| tree | d87a97b450d21edc0fafcfcb1e5b13020249bd60 /net/ipv4/tcp_output.c | |
| parent | e9ac503883abbd298b77477ccf60412bc0ca742f (diff) | |
| parent | 4c612826bec1441214816827979b62f84a097e91 (diff) | |
Merge branch 'linus'
Diffstat (limited to 'net/ipv4/tcp_output.c')
| -rw-r--r-- | net/ipv4/tcp_output.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c index 78b654ff421b..290019de766d 100644 --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c @@ -239,7 +239,7 @@ void tcp_select_initial_window(const struct sock *sk, int __space, __u32 mss, if (wscale_ok) { /* Set window scaling on max possible window */ space = max_t(u32, space, READ_ONCE(sock_net(sk)->ipv4.sysctl_tcp_rmem[2])); - space = max_t(u32, space, sysctl_rmem_max); + space = max_t(u32, space, READ_ONCE(sysctl_rmem_max)); space = min_t(u32, space, *window_clamp); *rcv_wscale = clamp_t(int, ilog2(space) - 15, 0, TCP_MAX_WSCALE); |