From bc7325313e527268e8213b5f31213c050c432169 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20=C5=BBenczykowski?= Date: Thu, 11 Feb 2021 17:25:27 -0800 Subject: [PATCH] Revert "RFC: ANDROID: net: ipv4: sysfs_net_ipv4: Fix TCP window size controlling knobs" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit c6bc8ac9c5f3062d97881194c7f49436ba648e51. But there are revert conflicts in: net/ipv4/tcp_input.c net/ipv4/tcp_output.c which effectively mean those files are not reverted (the relevant portions of code area already missing). Test: see follow up commit Bug: 180068784 Signed-off-by: Maciej Żenczykowski Change-Id: I70bc587e7bae4090dfd101f2427d7cc4fb4435af Git-Commit: b72347bdd09c65269646ce5eaefd0bb579552a44 Git-repo: http://source.codeaurora.org/quic/la/kernel/common Signed-off-by: Kaustubh Pandey --- include/net/tcp.h | 2 +- net/ipv4/sysfs_net_ipv4.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/net/tcp.h b/include/net/tcp.h index 1607c917f6bb..c2e25d887fbe 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h @@ -1345,7 +1345,7 @@ static inline void tcp_sack_reset(struct tcp_options_received *rx_opt) rx_opt->num_sacks = 0; } -u32 tcp_default_init_rwnd(const struct sock *sk, u32 mss); +u32 tcp_default_init_rwnd(u32 mss); void tcp_cwnd_restart(struct sock *sk, s32 delta); static inline void tcp_slow_start_after_idle_check(struct sock *sk) diff --git a/net/ipv4/sysfs_net_ipv4.c b/net/ipv4/sysfs_net_ipv4.c index 35a651aaee47..0cbbf10026a6 100644 --- a/net/ipv4/sysfs_net_ipv4.c +++ b/net/ipv4/sysfs_net_ipv4.c @@ -45,13 +45,13 @@ static ssize_t _name##_store(struct kobject *kobj, \ static struct kobj_attribute _name##_attr = \ __ATTR(_name, 0644, _name##_show, _name##_store) -CREATE_IPV4_FILE(tcp_wmem_min, init_net.ipv4.sysctl_tcp_wmem[0]); -CREATE_IPV4_FILE(tcp_wmem_def, init_net.ipv4.sysctl_tcp_wmem[1]); -CREATE_IPV4_FILE(tcp_wmem_max, init_net.ipv4.sysctl_tcp_wmem[2]); +CREATE_IPV4_FILE(tcp_wmem_min, sysctl_tcp_wmem[0]); +CREATE_IPV4_FILE(tcp_wmem_def, sysctl_tcp_wmem[1]); +CREATE_IPV4_FILE(tcp_wmem_max, sysctl_tcp_wmem[2]); -CREATE_IPV4_FILE(tcp_rmem_min, init_net.ipv4.sysctl_tcp_rmem[0]); -CREATE_IPV4_FILE(tcp_rmem_def, init_net.ipv4.sysctl_tcp_rmem[1]); -CREATE_IPV4_FILE(tcp_rmem_max, init_net.ipv4.sysctl_tcp_rmem[2]); +CREATE_IPV4_FILE(tcp_rmem_min, sysctl_tcp_rmem[0]); +CREATE_IPV4_FILE(tcp_rmem_def, sysctl_tcp_rmem[1]); +CREATE_IPV4_FILE(tcp_rmem_max, sysctl_tcp_rmem[2]); static struct attribute *ipv4_attrs[] = { &tcp_wmem_min_attr.attr,