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

Commit c6214a97 authored by Nikolay Borisov's avatar Nikolay Borisov Committed by David S. Miller
Browse files

ipv4: Namespaceify tcp_retries2 sysctl knob 



Signed-off-by: default avatarNikolay Borisov <kernel@kyup.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ae5c3f40

include/net/netns/ipv4.h

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

	int sysctl_tcp_reordering;

	int sysctl_tcp_retries1;

	int sysctl_tcp_retries2;



	struct ping_group_range ping_group_range;

include/net/tcp.h

+0 −1
Original line number Diff line number Diff line
@@ -240,7 +240,6 @@ extern int sysctl_tcp_timestamps; 
extern int sysctl_tcp_window_scaling;

extern int sysctl_tcp_sack;

extern int sysctl_tcp_fin_timeout;

extern int sysctl_tcp_retries2;

extern int sysctl_tcp_orphan_retries;

extern int sysctl_tcp_fastopen;

extern int sysctl_tcp_retrans_collapse;

net/ipv4/sysctl_net_ipv4.c

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

		.proc_handler	= proc_dointvec

	},

	{

		.procname	= "tcp_retries2",

		.data		= &sysctl_tcp_retries2,

		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= proc_dointvec

	},

	{

		.procname	= "tcp_fin_timeout",

		.data		= &sysctl_tcp_fin_timeout,
@@ -960,6 +953,13 @@ static struct ctl_table ipv4_net_table[] = { 
		.proc_handler	= proc_dointvec_minmax,

		.extra2		= &tcp_retr1_max

	},

	{

		.procname	= "tcp_retries2",

		.data		= &init_net.ipv4.sysctl_tcp_retries2,

		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= proc_dointvec

	},

	{ }

};

net/ipv4/tcp_ipv4.c

+1 −0
Original line number Diff line number Diff line
@@ -2392,6 +2392,7 @@ static int __net_init tcp_sk_init(struct net *net) 
	net->ipv4.sysctl_tcp_syncookies = 0;

	net->ipv4.sysctl_tcp_reordering = TCP_FASTRETRANS_THRESH;

	net->ipv4.sysctl_tcp_retries1 = TCP_RETR1;

	net->ipv4.sysctl_tcp_retries2 = TCP_RETR2;



	return 0;

fail:

net/ipv4/tcp_output.c

+2 −1
Original line number Diff line number Diff line
@@ -3476,6 +3476,7 @@ void tcp_send_probe0(struct sock *sk) 
{

	struct inet_connection_sock *icsk = inet_csk(sk);

	struct tcp_sock *tp = tcp_sk(sk);

	struct net *net = sock_net(sk);

	unsigned long probe_max;

	int err;
@@ -3489,7 +3490,7 @@ void tcp_send_probe0(struct sock *sk) 
	}



	if (err <= 0) {

		if (icsk->icsk_backoff < sysctl_tcp_retries2)

		if (icsk->icsk_backoff < net->ipv4.sysctl_tcp_retries2)

			icsk->icsk_backoff++;

		icsk->icsk_probes_out++;

		probe_max = TCP_RTO_MAX;