From bb1de67c7ad3b8ab7730815f5fb14b3ade04e2c3 Mon Sep 17 00:00:00 2001
From: Daniel Lezcano <dlezcano@fr.ibm.com>
Date: Thu, 10 Jan 2008 03:02:40 -0800
Subject: [PATCH] --- yaml --- r: 78731 b: refs/heads/master c:
 41a76906b3225997036efd88cbaae69d60b1e947 h: refs/heads/master i:   78729:
 f893cef8f91f770109e3c6d9bff1b11742a37ad2   78727:
 9f3bad6f18da63012728c3d1d86bea7ceb2420b3 v: v3

---
 [refs]                           | 2 +-
 trunk/include/net/netns/ipv6.h   | 1 +
 trunk/net/ipv6/af_inet6.c        | 1 +
 trunk/net/ipv6/icmp.c            | 6 ++----
 trunk/net/ipv6/sysctl_net_ipv6.c | 1 +
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 421e66bdd752..8fed01f06d12 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4990509f19e8f1e000a83a88fc46328f73b8a88a
+refs/heads/master: 41a76906b3225997036efd88cbaae69d60b1e947
diff --git a/trunk/include/net/netns/ipv6.h b/trunk/include/net/netns/ipv6.h
index 050d08809ef2..10733a6f1bd4 100644
--- a/trunk/include/net/netns/ipv6.h
+++ b/trunk/include/net/netns/ipv6.h
@@ -23,6 +23,7 @@ struct netns_sysctl_ipv6 {
 	int ip6_rt_gc_elasticity;
 	int ip6_rt_mtu_expires;
 	int ip6_rt_min_advmss;
+	int icmpv6_time;
 };
 
 struct netns_ipv6 {
diff --git a/trunk/net/ipv6/af_inet6.c b/trunk/net/ipv6/af_inet6.c
index 3aea84a1822a..218b8b3050a1 100644
--- a/trunk/net/ipv6/af_inet6.c
+++ b/trunk/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;
diff --git a/trunk/net/ipv6/icmp.c b/trunk/net/ipv6/icmp.c
index dfe3b37c43e9..5395afe55ca5 100644
--- a/trunk/net/ipv6/icmp.c
+++ b/trunk/net/ipv6/icmp.c
@@ -154,8 +154,6 @@ static int is_ineligible(struct sk_buff *skb)
 	return 0;
 }
 
-static int sysctl_icmpv6_time __read_mostly = 1*HZ;
-
 /*
  * Check the ICMP output rate limit
  */
@@ -186,7 +184,7 @@ static inline int icmpv6_xrlim_allow(struct sock *sk, int type,
 		res = 1;
 	} else {
 		struct rt6_info *rt = (struct rt6_info *)dst;
-		int tmo = sysctl_icmpv6_time;
+		int tmo = init_net.ipv6.sysctl.icmpv6_time;
 
 		/* Give more bandwidth to wider prefixes. */
 		if (rt->rt6i_dst.plen < 128)
@@ -911,7 +909,7 @@ ctl_table ipv6_icmp_table_template[] = {
 	{
 		.ctl_name	= NET_IPV6_ICMP_RATELIMIT,
 		.procname	= "ratelimit",
-		.data		= &sysctl_icmpv6_time,
+		.data		= &init_net.ipv6.sysctl.icmpv6_time,
 		.maxlen		= sizeof(int),
 		.mode		= 0644,
 		.proc_handler	= &proc_dointvec
diff --git a/trunk/net/ipv6/sysctl_net_ipv6.c b/trunk/net/ipv6/sysctl_net_ipv6.c
index b4ba422f2714..5e0af4d46324 100644
--- a/trunk/net/ipv6/sysctl_net_ipv6.c
+++ b/trunk/net/ipv6/sysctl_net_ipv6.c
@@ -125,6 +125,7 @@ static int ipv6_sysctl_net_init(struct net *net)
 	ipv6_route_table[8].data = &net->ipv6.sysctl.ip6_rt_min_advmss;
 	ipv6_table[0].child = ipv6_route_table;
 
+	ipv6_icmp_table[0].data = &net->ipv6.sysctl.icmpv6_time;
 	ipv6_table[1].child = ipv6_icmp_table;
 
 	ipv6_table[2].data = &net->ipv6.sysctl.bindv6only;