Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bc732531 authored by Maciej Żenczykowski's avatar Maciej Żenczykowski Committed by Gerrit - the friendly Code Review server
Browse files

Revert "RFC: ANDROID: net: ipv4: sysfs_net_ipv4: Fix TCP window size controlling knobs" 



This reverts commit c6bc8ac9.

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: default avatarMaciej Żenczykowski <maze@google.com>
Change-Id: I70bc587e7bae4090dfd101f2427d7cc4fb4435af
Git-Commit: b72347bdd09c65269646ce5eaefd0bb579552a44
Git-repo: http://source.codeaurora.org/quic/la/kernel/common


Signed-off-by: default avatarKaustubh Pandey <kapandey@codeaurora.org>
parent 71add667

include/net/tcp.h

+1 −1
Original line number Diff line number Diff line
@@ -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)

net/ipv4/sysfs_net_ipv4.c

+6 −6
Original line number Diff line number Diff line
@@ -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,