tcp: Namespace-ify sysctl_tcp_early_retrans (2ae21cf5) · Commits · 戴 / test

include/net/netns/ipv4.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -128,6 +128,7 @@ struct netns_ipv4 {
		int sysctl_tcp_sack;
		int sysctl_tcp_window_scaling;
		int sysctl_tcp_timestamps;
		int sysctl_tcp_early_retrans;
		struct inet_timewait_death_row tcp_death_row;
		int sysctl_max_syn_backlog;
		int sysctl_tcp_fastopen;

+0 −1

Original line number	Diff line number	Diff line
		@@ -265,7 +265,6 @@ 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_early_retrans;
		extern int sysctl_tcp_recovery;
		#define TCP_RACK_LOSS_DETECTION 0x1 /* Use RACK to detect losses */

+9 −9

Original line number	Diff line number	Diff line
		@@ -634,15 +634,6 @@ static struct ctl_table ipv4_table[] = {
		.mode = 0644,
		.proc_handler = proc_dointvec
		},
		{
		.procname = "tcp_early_retrans",
		.data = &sysctl_tcp_early_retrans,
		.maxlen = sizeof(int),
		.mode = 0644,
		.proc_handler = proc_dointvec_minmax,
		.extra1 = &zero,
		.extra2 = &four,
		},
		{
		.procname = "tcp_min_tso_segs",
		.data = &sysctl_tcp_min_tso_segs,
		@@ -1145,6 +1136,15 @@ static struct ctl_table ipv4_net_table[] = {
		.mode = 0644,
		.proc_handler = proc_dointvec
		},
		{
		.procname = "tcp_early_retrans",
		.data = &init_net.ipv4.sysctl_tcp_early_retrans,
		.maxlen = sizeof(int),
		.mode = 0644,
		.proc_handler = proc_dointvec_minmax,
		.extra1 = &zero,
		.extra2 = &four,
		},
		{ }
		};

+0 −1

Original line number	Diff line number	Diff line
		@@ -95,7 +95,6 @@ int sysctl_tcp_max_orphans __read_mostly = NR_FILE;
		int sysctl_tcp_frto __read_mostly = 2;
		int sysctl_tcp_min_rtt_wlen __read_mostly = 300;
		int sysctl_tcp_moderate_rcvbuf __read_mostly = 1;
		int sysctl_tcp_early_retrans __read_mostly = 3;
		int sysctl_tcp_invalid_ratelimit __read_mostly = HZ/2;

		#define FLAG_DATA 0x01 /* Incoming frame contained data. */

+1 −0

Original line number	Diff line number	Diff line
		@@ -2484,6 +2484,7 @@ static int __net_init tcp_sk_init(struct net *net)
		net->ipv4.sysctl_tcp_sack = 1;
		net->ipv4.sysctl_tcp_window_scaling = 1;
		net->ipv4.sysctl_tcp_timestamps = 1;
		net->ipv4.sysctl_tcp_early_retrans = 3;

		net->ipv4.sysctl_tcp_fastopen = TFO_CLIENT_ENABLE;
		spin_lock_init(&net->ipv4.tcp_fastopen_ctx_lock);