summaryrefslogtreecommitdiffstats
path: root/net/ipv6/af_inet6.c
diff options
context:
space:
mode:
authorDaniel Lezcano2008-01-10 12:02:40 +0100
committerDavid S. Miller2008-01-29 00:01:20 +0100
commit41a76906b3225997036efd88cbaae69d60b1e947 (patch)
treec8970051ba81d3ecc50b616ceb289d7d532a97bc /net/ipv6/af_inet6.c
parent[NETNS][IPV6]: Make sysctls route per namespace. (diff)
downloadkernel-qcow2-linux-41a76906b3225997036efd88cbaae69d60b1e947.tar.gz
kernel-qcow2-linux-41a76906b3225997036efd88cbaae69d60b1e947.tar.xz
kernel-qcow2-linux-41a76906b3225997036efd88cbaae69d60b1e947.zip
[NETNS][IPV6]: Make icmpv6_time sysctl per namespace.
This patch moves the icmpv6_time sysctl to the network namespace structure. Because the ipv6 protocol is not yet per namespace, the variable is accessed relatively to the initial network namespace. Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/af_inet6.c')
-rw-r--r--net/ipv6/af_inet6.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c
index 3aea84a1822a..218b8b3050a1 100644
--- a/net/ipv6/af_inet6.c
+++ b/net/ipv6/af_inet6.c
@@ -734,6 +734,7 @@ static int inet6_net_init(struct net *net)
net->ipv6.sysctl.ip6_rt_gc_elasticity = 9;
net->ipv6.sysctl.ip6_rt_mtu_expires = 10*60*HZ;
net->ipv6.sysctl.ip6_rt_min_advmss = IPV6_MIN_MTU - 20 - 40;
+ net->ipv6.sysctl.icmpv6_time = 1*HZ;
ipv6_frag_sysctl_init(net);
return 0;