[NETNS][IPV6]: Make sysctls route per namespace.

[net-next-2.6.git] / net / ipv6 / sysctl_net_ipv6.c

diff --git a/net/ipv6/sysctl_net_ipv6.c b/net/ipv6/sysctl_net_ipv6.c
index d223159638d34a73f9c2c3c641e6d29501f05e80..b4ba422f2714310025ab3d3437e588d54db4d8e1 100644 (file)
--- a/net/ipv6/sysctl_net_ipv6.c
+++ b/net/ipv6/sysctl_net_ipv6.c
@@ -113,7 +113,18 @@ static int ipv6_sysctl_net_init(struct net *net)
        if (!ipv6_icmp_table)
                goto out_ipv6_route_table;
 
+       ipv6_route_table[0].data = &net->ipv6.sysctl.flush_delay;
+       /* ipv6_route_table[1].data will be handled when we have
+          routes per namespace */
+       ipv6_route_table[2].data = &net->ipv6.sysctl.ip6_rt_max_size;
+       ipv6_route_table[3].data = &net->ipv6.sysctl.ip6_rt_gc_min_interval;
+       ipv6_route_table[4].data = &net->ipv6.sysctl.ip6_rt_gc_timeout;
+       ipv6_route_table[5].data = &net->ipv6.sysctl.ip6_rt_gc_interval;
+       ipv6_route_table[6].data = &net->ipv6.sysctl.ip6_rt_gc_elasticity;
+       ipv6_route_table[7].data = &net->ipv6.sysctl.ip6_rt_mtu_expires;
+       ipv6_route_table[8].data = &net->ipv6.sysctl.ip6_rt_min_advmss;
        ipv6_table[0].child = ipv6_route_table;
+
        ipv6_table[1].child = ipv6_icmp_table;
 
        ipv6_table[2].data = &net->ipv6.sysctl.bindv6only;