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

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

tcp: Namespace-ify sysctl_tcp_recovery 



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

include/net/netns/ipv4.h

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

	int sysctl_tcp_timestamps;

	int sysctl_tcp_early_retrans;

	int sysctl_tcp_recovery;

	struct inet_timewait_death_row tcp_death_row;

	int sysctl_max_syn_backlog;

	int sysctl_tcp_fastopen;

include/net/tcp.h

+1 −1
Original line number Diff line number Diff line
@@ -265,7 +265,7 @@ extern int sysctl_tcp_workaround_signed_windows; 
extern int sysctl_tcp_slow_start_after_idle;

extern int sysctl_tcp_thin_linear_timeouts;

extern int sysctl_tcp_thin_dupack;

extern int sysctl_tcp_recovery;



#define TCP_RACK_LOSS_DETECTION  0x1 /* Use RACK to detect losses */



extern int sysctl_tcp_limit_output_bytes;

net/ipv4/sysctl_net_ipv4.c

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

		.proc_handler	= proc_dointvec

	},

	{

		.procname	= "tcp_recovery",

		.data		= &sysctl_tcp_recovery,

		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= proc_dointvec,

	},

	{

		.procname	= "tcp_max_reordering",

		.data		= &sysctl_tcp_max_reordering,
@@ -1145,6 +1138,13 @@ static struct ctl_table ipv4_net_table[] = { 
		.extra1		= &zero,

		.extra2		= &four,

	},

	{

		.procname	= "tcp_recovery",

		.data		= &init_net.ipv4.sysctl_tcp_recovery,

		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= proc_dointvec,

	},

	{ }

};

net/ipv4/tcp_input.c

+1 −1
Original line number Diff line number Diff line
@@ -2788,7 +2788,7 @@ static void tcp_rack_identify_loss(struct sock *sk, int *ack_flag) 
	struct tcp_sock *tp = tcp_sk(sk);



	/* Use RACK to detect loss */

	if (sysctl_tcp_recovery & TCP_RACK_LOSS_DETECTION) {

	if (sock_net(sk)->ipv4.sysctl_tcp_recovery & TCP_RACK_LOSS_DETECTION) {

		u32 prior_retrans = tp->retrans_out;



		tcp_rack_mark_lost(sk);

net/ipv4/tcp_ipv4.c

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

	net->ipv4.sysctl_tcp_timestamps = 1;

	net->ipv4.sysctl_tcp_early_retrans = 3;

	net->ipv4.sysctl_tcp_recovery = TCP_RACK_LOSS_DETECTION;



	net->ipv4.sysctl_tcp_fastopen = TFO_CLIENT_ENABLE;

	spin_lock_init(&net->ipv4.tcp_fastopen_ctx_lock);