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

Commit d137e7f9 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "net: ipv4: Remove tcp_default_init_rwnd"

parents f367cb54 f094f0c4

include/net/netns/ipv4.h

+0 −1
Original line number Diff line number Diff line
@@ -161,7 +161,6 @@ struct netns_ipv4 { 
	int sysctl_tcp_invalid_ratelimit;

	int sysctl_tcp_pacing_ss_ratio;

	int sysctl_tcp_pacing_ca_ratio;

	int sysctl_tcp_default_init_rwnd;

	int sysctl_tcp_wmem[3];

	int sysctl_tcp_rmem[3];

	int sysctl_tcp_comp_sack_nr;

net/ipv4/sysctl_net_ipv4.c

+0 −22
Original line number Diff line number Diff line
@@ -222,21 +222,6 @@ static int ipv4_fwd_update_priority(struct ctl_table *table, int write, 
	return ret;

}



/* Validate changes from /proc interface. */

static int proc_tcp_default_init_rwnd(struct ctl_table *ctl, int write,

				      void __user *buffer,

				      size_t *lenp, loff_t *ppos)

{

	int old_value = *(int *)ctl->data;

	int ret = proc_dointvec(ctl, write, buffer, lenp, ppos);

	int new_value = *(int *)ctl->data;



	if (write && ret == 0 && (new_value < 3 || new_value > 100))

		*(int *)ctl->data = old_value;



	return ret;

}



static int proc_tcp_congestion_control(struct ctl_table *ctl, int write,

				       void __user *buffer, size_t *lenp, loff_t *ppos)

{
@@ -1212,13 +1197,6 @@ static struct ctl_table ipv4_net_table[] = { 
		.extra1		= &zero,

		.extra2		= &thousand,

	},

	{

		.procname       = "tcp_default_init_rwnd",

		.data           = &init_net.ipv4.sysctl_tcp_default_init_rwnd,

		.maxlen         = sizeof(int),

		.mode           = 0644,

		.proc_handler   = proc_tcp_default_init_rwnd

	},

	{

		.procname	= "tcp_wmem",

		.data		= &init_net.ipv4.sysctl_tcp_wmem,

net/ipv4/tcp_ipv4.c

+0 −1
Original line number Diff line number Diff line
@@ -2583,7 +2583,6 @@ static int __net_init tcp_sk_init(struct net *net) 
	net->ipv4.sysctl_tcp_invalid_ratelimit = HZ/2;

	net->ipv4.sysctl_tcp_pacing_ss_ratio = 200;

	net->ipv4.sysctl_tcp_pacing_ca_ratio = 120;

	net->ipv4.sysctl_tcp_default_init_rwnd = TCP_INIT_CWND * 2;

	if (net != &init_net) {

		memcpy(net->ipv4.sysctl_tcp_rmem,

		       init_net.ipv4.sysctl_tcp_rmem,