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

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

tcp: Namespace-ify sysctl_tcp_fack 



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

include/net/netns/ipv4.h

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

	int sysctl_tcp_rfc1337;

	int sysctl_tcp_abort_on_overflow;

	int sysctl_tcp_fack;

	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
@@ -244,7 +244,6 @@ void tcp_time_wait(struct sock *sk, int state, int timeo); 


/* sysctl variables for tcp */

extern int sysctl_tcp_max_orphans;

extern int sysctl_tcp_fack;

extern int sysctl_tcp_reordering;

extern int sysctl_tcp_max_reordering;

extern int sysctl_tcp_dsack;

net/ipv4/sysctl_net_ipv4.c

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

		.proc_handler	= proc_dointvec_jiffies,

	},

	{

		.procname	= "tcp_fack",

		.data		= &sysctl_tcp_fack,

		.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[] = { 
		.mode		= 0644,

		.proc_handler	= proc_dointvec

	},

	{

		.procname	= "tcp_fack",

		.data		= &init_net.ipv4.sysctl_tcp_fack,

		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= proc_dointvec

	},

	{ }

};

net/ipv4/tcp.c

+1 −1
Original line number Diff line number Diff line
@@ -2517,7 +2517,7 @@ static int tcp_repair_options_est(struct sock *sk, 
				return -EINVAL;



			tp->rx_opt.sack_ok |= TCP_SACK_SEEN;

			if (sysctl_tcp_fack)

			if (sock_net(sk)->ipv4.sysctl_tcp_fack)

				tcp_enable_fack(tp);

			break;

		case TCPOPT_TIMESTAMP:

net/ipv4/tcp_input.c

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

#include <linux/static_key.h>



int sysctl_tcp_fack __read_mostly;

int sysctl_tcp_max_reordering __read_mostly = 300;

int sysctl_tcp_dsack __read_mostly = 1;

int sysctl_tcp_app_win __read_mostly = 31;
@@ -5720,7 +5719,7 @@ static int tcp_rcv_synsent_state_process(struct sock *sk, struct sk_buff *skb, 
			tp->tcp_header_len = sizeof(struct tcphdr);

		}



		if (tcp_is_sack(tp) && sysctl_tcp_fack)

		if (tcp_is_sack(tp) && sock_net(sk)->ipv4.sysctl_tcp_fack)

			tcp_enable_fack(tp);



		tcp_sync_mss(sk, icsk->icsk_pmtu_cookie);