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

Commit 9bb37ef0 authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

tcp: Namespaceify sysctl_tcp_window_scaling 



Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f9301034

include/net/netns/ipv4.h

+1 −0
Original line number Diff line number Diff line
@@ -123,6 +123,7 @@ struct netns_ipv4 { 
	unsigned int sysctl_tcp_notsent_lowat;

	int sysctl_tcp_tw_reuse;

	int sysctl_tcp_sack;

	int sysctl_tcp_window_scaling;

	struct inet_timewait_death_row tcp_death_row;

	int sysctl_max_syn_backlog;

include/net/tcp.h

+0 −1
Original line number Diff line number Diff line
@@ -238,7 +238,6 @@ void tcp_time_wait(struct sock *sk, int state, int timeo); 


/* sysctl variables for tcp */

extern int sysctl_tcp_timestamps;

extern int sysctl_tcp_window_scaling;

extern int sysctl_tcp_fastopen;

extern int sysctl_tcp_retrans_collapse;

extern int sysctl_tcp_stdurg;

net/ipv4/syncookies.c

+1 −1
Original line number Diff line number Diff line
@@ -257,7 +257,7 @@ bool cookie_timestamp_decode(const struct net *net, 
	tcp_opt->wscale_ok = 1;

	tcp_opt->snd_wscale = options & TS_OPT_WSCALE_MASK;



	return sysctl_tcp_window_scaling != 0;

	return net->ipv4.sysctl_tcp_window_scaling != 0;

}

EXPORT_SYMBOL(cookie_timestamp_decode);

net/ipv4/sysctl_net_ipv4.c

+7 −7
Original line number Diff line number Diff line
@@ -371,13 +371,6 @@ static struct ctl_table ipv4_table[] = { 
		.mode		= 0644,

		.proc_handler	= proc_dointvec

	},

	{

		.procname	= "tcp_window_scaling",

		.data		= &sysctl_tcp_window_scaling,

		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= proc_dointvec

	},

	{

		.procname	= "tcp_retrans_collapse",

		.data		= &sysctl_tcp_retrans_collapse,
@@ -1116,6 +1109,13 @@ static struct ctl_table ipv4_net_table[] = { 
		.mode		= 0644,

		.proc_handler	= proc_dointvec

	},

	{

		.procname	= "tcp_window_scaling",

		.data		= &init_net.ipv4.sysctl_tcp_window_scaling,

		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= proc_dointvec

	},

	{ }

};

net/ipv4/tcp_input.c

+1 −2
Original line number Diff line number Diff line
@@ -77,7 +77,6 @@ 
#include <linux/errqueue.h>



int sysctl_tcp_timestamps __read_mostly = 1;

int sysctl_tcp_window_scaling __read_mostly = 1;

int sysctl_tcp_fack __read_mostly;

int sysctl_tcp_max_reordering __read_mostly = 300;

int sysctl_tcp_dsack __read_mostly = 1;
@@ -3765,7 +3764,7 @@ void tcp_parse_options(const struct net *net, 
				break;

			case TCPOPT_WINDOW:

				if (opsize == TCPOLEN_WINDOW && th->syn &&

				    !estab && sysctl_tcp_window_scaling) {

				    !estab && net->ipv4.sysctl_tcp_window_scaling) {

					__u8 snd_wscale = *(__u8 *)ptr;

					opt_rx->wscale_ok = 1;

					if (snd_wscale > TCP_MAX_WSCALE) {