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

Commit 974eda11 authored by Hannes Frederic Sowa's avatar Hannes Frederic Sowa Committed by David S. Miller
Browse files

inet: make no_pmtu_disc per namespace and kill ipv4_config 



The other field in ipv4_config, log_martians, was converted to a
per-interface setting, so we can just remove the whole structure.

Signed-off-by: default avatarHannes Frederic Sowa <hannes@stressinduktion.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 143c9054

include/net/ip.h

+0 −6
Original line number Diff line number Diff line
@@ -177,12 +177,6 @@ void ip_send_unicast_reply(struct net *net, struct sk_buff *skb, __be32 daddr, 
			   __be32 saddr, const struct ip_reply_arg *arg,

			   unsigned int len);



struct ipv4_config {

	int	log_martians;

	int	no_pmtu_disc;

};



extern struct ipv4_config ipv4_config;

#define IP_INC_STATS(net, field)	SNMP_INC_STATS64((net)->mib.ip_statistics, field)

#define IP_INC_STATS_BH(net, field)	SNMP_INC_STATS64_BH((net)->mib.ip_statistics, field)

#define IP_ADD_STATS(net, field, val)	SNMP_ADD_STATS64((net)->mib.ip_statistics, field, val)

include/net/netns/ipv4.h

+1 −0
Original line number Diff line number Diff line
@@ -69,6 +69,7 @@ struct netns_ipv4 { 
	struct local_ports sysctl_local_ports;



	int sysctl_tcp_ecn;

	int sysctl_ip_no_pmtu_disc;



	kgid_t sysctl_ping_group_range[2];

net/ipv4/af_inet.c

+1 −4
Original line number Diff line number Diff line
@@ -126,9 +126,6 @@ 
static struct list_head inetsw[SOCK_MAX];

static DEFINE_SPINLOCK(inetsw_lock);



struct ipv4_config ipv4_config;

EXPORT_SYMBOL(ipv4_config);



/* New destruction routine */



void inet_sock_destruct(struct sock *sk)
@@ -342,7 +339,7 @@ lookup_protocol: 
			inet->hdrincl = 1;

	}



	if (ipv4_config.no_pmtu_disc)

	if (net->ipv4.sysctl_ip_no_pmtu_disc)

		inet->pmtudisc = IP_PMTUDISC_DONT;

	else

		inet->pmtudisc = IP_PMTUDISC_WANT;

net/ipv4/icmp.c

+1 −1
Original line number Diff line number Diff line
@@ -705,7 +705,7 @@ static void icmp_unreach(struct sk_buff *skb) 
		case ICMP_PORT_UNREACH:

			break;

		case ICMP_FRAG_NEEDED:

			if (ipv4_config.no_pmtu_disc) {

			if (net->ipv4.sysctl_ip_no_pmtu_disc) {

				LIMIT_NETDEBUG(KERN_INFO pr_fmt("%pI4: fragmentation needed and DF set\n"),

					       &iph->daddr);

			} else {

net/ipv4/sysctl_net_ipv4.c

+7 −7
Original line number Diff line number Diff line
@@ -285,13 +285,6 @@ static struct ctl_table ipv4_table[] = { 
		.extra1		= &ip_ttl_min,

		.extra2		= &ip_ttl_max,

	},

	{

		.procname	= "ip_no_pmtu_disc",

		.data		= &ipv4_config.no_pmtu_disc,

		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= proc_dointvec

	},

	{

		.procname	= "ip_nonlocal_bind",

		.data		= &sysctl_ip_nonlocal_bind,
@@ -831,6 +824,13 @@ static struct ctl_table ipv4_net_table[] = { 
		.mode		= 0644,

		.proc_handler	= ipv4_local_port_range,

	},

	{

		.procname	= "ip_no_pmtu_disc",

		.data		= &init_net.ipv4.sysctl_ip_no_pmtu_disc,

		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= proc_dointvec

	},

	{ }

};