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

Commit 3f4c7c6f authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

tcp: Namespace-ify sysctl_tcp_stdurg 



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

include/net/netns/ipv4.h

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

	int sysctl_tcp_slow_start_after_idle;

	int sysctl_tcp_retrans_collapse;

	int sysctl_tcp_stdurg;

	struct inet_timewait_death_row tcp_death_row;

	int sysctl_max_syn_backlog;

	int sysctl_tcp_fastopen;

include/net/tcp.h

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




/* sysctl variables for tcp */

extern int sysctl_tcp_stdurg;

extern int sysctl_tcp_rfc1337;

extern int sysctl_tcp_abort_on_overflow;

extern int sysctl_tcp_max_orphans;

net/ipv4/sysctl_net_ipv4.c

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

		.proc_handler	= proc_dointvec

	},

	{

		.procname	= "tcp_stdurg",

		.data		= &sysctl_tcp_stdurg,

		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= proc_dointvec

	},

	{

		.procname	= "tcp_rfc1337",

		.data		= &sysctl_tcp_rfc1337,
@@ -1145,6 +1138,13 @@ static struct ctl_table ipv4_net_table[] = { 
		.mode		= 0644,

		.proc_handler	= proc_dointvec

	},

	{

		.procname	= "tcp_stdurg",

		.data		= &init_net.ipv4.sysctl_tcp_stdurg,

		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= proc_dointvec

	},

	{ }

};

net/ipv4/tcp_input.c

+1 −2
Original line number Diff line number Diff line
@@ -89,7 +89,6 @@ EXPORT_SYMBOL(sysctl_tcp_adv_win_scale); 
/* rfc5961 challenge ack rate limiting */

int sysctl_tcp_challenge_ack_limit = 1000;



int sysctl_tcp_stdurg __read_mostly;

int sysctl_tcp_rfc1337 __read_mostly;

int sysctl_tcp_max_orphans __read_mostly = NR_FILE;

int sysctl_tcp_frto __read_mostly = 2;
@@ -5123,7 +5122,7 @@ static void tcp_check_urg(struct sock *sk, const struct tcphdr *th) 
	struct tcp_sock *tp = tcp_sk(sk);

	u32 ptr = ntohs(th->urg_ptr);



	if (ptr && !sysctl_tcp_stdurg)

	if (ptr && !sock_net(sk)->ipv4.sysctl_tcp_stdurg)

		ptr--;

	ptr += ntohl(th->seq);