From 036fa20734cbcbf2f7472d9062a7ca48f6d3c1f3 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 27 Apr 2023 11:32:21 +0000 Subject: [PATCH] Revert "tcp: restrict net.ipv4.tcp_app_win" This reverts commit a069d4d98cd271a70b561cb757485efe5f5e5a7e which is commit dc5110c2d959c1707e12df5f792f41d90614adaa upstream. It breaks the Android kernel abi, and is not needed at this point in time. If it is required, it can come back in an ABI-safe way. Bug: 161946584 Change-Id: I7ef145a192f15df2179150f9f0087746725d27ea Signed-off-by: Greg Kroah-Hartman --- Documentation/networking/ip-sysctl.rst | 2 -- net/ipv4/sysctl_net_ipv4.c | 3 --- 2 files changed, 5 deletions(-) diff --git a/Documentation/networking/ip-sysctl.rst b/Documentation/networking/ip-sysctl.rst index 705d1ded3a4a..eedce7474ad3 100644 --- a/Documentation/networking/ip-sysctl.rst +++ b/Documentation/networking/ip-sysctl.rst @@ -272,8 +272,6 @@ tcp_app_win - INTEGER Reserve max(window/2^tcp_app_win, mss) of window for application buffer. Value 0 is special, it means that nothing is reserved. - Possible values are [0, 31], inclusive. - Default: 31 tcp_autocorking - BOOLEAN diff --git a/net/ipv4/sysctl_net_ipv4.c b/net/ipv4/sysctl_net_ipv4.c index e7449145318a..8c2a45eb783c 100644 --- a/net/ipv4/sysctl_net_ipv4.c +++ b/net/ipv4/sysctl_net_ipv4.c @@ -37,7 +37,6 @@ static int ip_local_port_range_min[] = { 1, 1 }; static int ip_local_port_range_max[] = { 65535, 65535 }; static int tcp_adv_win_scale_min = -31; static int tcp_adv_win_scale_max = 31; -static int tcp_app_win_max = 31; static int tcp_min_snd_mss_min = TCP_MIN_SND_MSS; static int tcp_min_snd_mss_max = 65535; static int ip_privileged_port_min; @@ -1123,8 +1122,6 @@ static struct ctl_table ipv4_net_table[] = { .maxlen = sizeof(u8), .mode = 0644, .proc_handler = proc_dou8vec_minmax, - .extra1 = SYSCTL_ZERO, - .extra2 = &tcp_app_win_max, }, { .procname = "tcp_adv_win_scale",