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

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

tcp: Namespace-ify sysctl_tcp_nometrics_save 



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

include/net/netns/ipv4.h

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

	int sysctl_tcp_adv_win_scale;

	int sysctl_tcp_frto;

	int sysctl_tcp_nometrics_save;

	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
@@ -247,7 +247,6 @@ extern int sysctl_tcp_max_orphans; 
extern long sysctl_tcp_mem[3];

extern int sysctl_tcp_wmem[3];

extern int sysctl_tcp_rmem[3];

extern int sysctl_tcp_nometrics_save;

extern int sysctl_tcp_moderate_rcvbuf;

extern int sysctl_tcp_tso_win_divisor;

extern int sysctl_tcp_workaround_signed_windows;

net/ipv4/sysctl_net_ipv4.c

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

		.proc_handler	= proc_dointvec

	},

	{

		.procname	= "tcp_no_metrics_save",

		.data		= &sysctl_tcp_nometrics_save,

		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= proc_dointvec,

	},

	{

		.procname	= "tcp_moderate_rcvbuf",

		.data		= &sysctl_tcp_moderate_rcvbuf,
@@ -1145,6 +1138,13 @@ static struct ctl_table ipv4_net_table[] = { 
		.mode		= 0644,

		.proc_handler	= proc_dointvec

	},

	{

		.procname	= "tcp_no_metrics_save",

		.data		= &init_net.ipv4.sysctl_tcp_nometrics_save,

		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= proc_dointvec,

	},

	{ }

};

net/ipv4/tcp_metrics.c

+1 −3
Original line number Diff line number Diff line
@@ -20,8 +20,6 @@ 
#include <net/tcp.h>

#include <net/genetlink.h>



int sysctl_tcp_nometrics_save __read_mostly;



static struct tcp_metrics_block *__tcp_get_metrics(const struct inetpeer_addr *saddr,

						   const struct inetpeer_addr *daddr,

						   struct net *net, unsigned int hash);
@@ -330,7 +328,7 @@ void tcp_update_metrics(struct sock *sk) 
	int m;



	sk_dst_confirm(sk);

	if (sysctl_tcp_nometrics_save || !dst)

	if (net->ipv4.sysctl_tcp_nometrics_save || !dst)

		return;



	rcu_read_lock();