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

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

tcp: Namespace-ify sysctl_tcp_dsack 



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

include/net/netns/ipv4.h

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

	int sysctl_tcp_fack;

	int sysctl_tcp_max_reordering;

	int sysctl_tcp_dsack;

	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_dsack;

extern long sysctl_tcp_mem[3];

extern int sysctl_tcp_wmem[3];

extern int sysctl_tcp_rmem[3];

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_dsack",

		.data		= &sysctl_tcp_dsack,

		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= proc_dointvec

	},

	{

		.procname	= "tcp_mem",

		.maxlen		= sizeof(sysctl_tcp_mem),
@@ -1145,6 +1138,13 @@ static struct ctl_table ipv4_net_table[] = { 
		.mode		= 0644,

		.proc_handler	= proc_dointvec

	},

	{

		.procname	= "tcp_dsack",

		.data		= &init_net.ipv4.sysctl_tcp_dsack,

		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= proc_dointvec

	},

	{ }

};

net/ipv4/tcp_input.c

+2 −3
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_dsack __read_mostly = 1;

int sysctl_tcp_app_win __read_mostly = 31;

int sysctl_tcp_adv_win_scale __read_mostly = 1;

EXPORT_SYMBOL(sysctl_tcp_adv_win_scale);
@@ -4150,7 +4149,7 @@ static void tcp_dsack_set(struct sock *sk, u32 seq, u32 end_seq) 
{

	struct tcp_sock *tp = tcp_sk(sk);



	if (tcp_is_sack(tp) && sysctl_tcp_dsack) {

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

		int mib_idx;



		if (before(seq, tp->rcv_nxt))
@@ -4185,7 +4184,7 @@ static void tcp_send_dupack(struct sock *sk, const struct sk_buff *skb) 
		NET_INC_STATS(sock_net(sk), LINUX_MIB_DELAYEDACKLOST);

		tcp_enter_quickack_mode(sk);



		if (tcp_is_sack(tp) && sysctl_tcp_dsack) {

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

			u32 end_seq = TCP_SKB_CB(skb)->end_seq;



			if (after(TCP_SKB_CB(skb)->end_seq, tp->rcv_nxt))

net/ipv4/tcp_ipv4.c

+1 −0
Original line number Diff line number Diff line
@@ -2489,6 +2489,7 @@ static int __net_init tcp_sk_init(struct net *net) 
	net->ipv4.sysctl_tcp_slow_start_after_idle = 1; /* By default, RFC2861 behavior.  */

	net->ipv4.sysctl_tcp_retrans_collapse = 1;

	net->ipv4.sysctl_tcp_max_reordering = 300;

	net->ipv4.sysctl_tcp_dsack = 1;



	net->ipv4.sysctl_tcp_fastopen = TFO_CLIENT_ENABLE;

	spin_lock_init(&net->ipv4.tcp_fastopen_ctx_lock);