From d2eec2157a5e33b2a7ff8d31c9f2c8063bd91c23 Mon Sep 17 00:00:00 2001
From: Lucian Adrian Grijincu <lucian.grijincu@gmail.com>
Date: Thu, 24 Feb 2011 19:48:03 +0000
Subject: [PATCH] --- yaml --- r: 233827 b: refs/heads/master c:
 c486da34390846b430896a407b47f0cea3a4189c h: refs/heads/master i:   233825:
 1a039c67539c10b90249cca896443ccfc1e1b72a   233823:
 32d182c0d5433e3465d5b799b179079f56793d23 v: v3

---
 [refs]                 |  2 +-
 trunk/net/ipv6/route.c | 17 ++++++++++-------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 0f2efcf8d9a9..5f3359bec071 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cdf64c803e6cfec72259f7bb2654261584bb80a8
+refs/heads/master: c486da34390846b430896a407b47f0cea3a4189c
diff --git a/trunk/net/ipv6/route.c b/trunk/net/ipv6/route.c
index a998db6e7895..904312e25a3c 100644
--- a/trunk/net/ipv6/route.c
+++ b/trunk/net/ipv6/route.c
@@ -2557,14 +2557,16 @@ static
 int ipv6_sysctl_rtcache_flush(ctl_table *ctl, int write,
 			      void __user *buffer, size_t *lenp, loff_t *ppos)
 {
-	struct net *net = current->nsproxy->net_ns;
-	int delay = net->ipv6.sysctl.flush_delay;
-	if (write) {
-		proc_dointvec(ctl, write, buffer, lenp, ppos);
-		fib6_run_gc(delay <= 0 ? ~0UL : (unsigned long)delay, net);
-		return 0;
-	} else
+	struct net *net;
+	int delay;
+	if (!write)
 		return -EINVAL;
+
+	net = (struct net *)ctl->extra1;
+	delay = net->ipv6.sysctl.flush_delay;
+	proc_dointvec(ctl, write, buffer, lenp, ppos);
+	fib6_run_gc(delay <= 0 ? ~0UL : (unsigned long)delay, net);
+	return 0;
 }
 
 ctl_table ipv6_route_table_template[] = {
@@ -2651,6 +2653,7 @@ struct ctl_table * __net_init ipv6_route_sysctl_init(struct net *net)
 
 	if (table) {
 		table[0].data = &net->ipv6.sysctl.flush_delay;
+		table[0].extra1 = net;
 		table[1].data = &net->ipv6.ip6_dst_ops.gc_thresh;
 		table[2].data = &net->ipv6.sysctl.ip6_rt_max_size;
 		table[3].data = &net->ipv6.sysctl.ip6_rt_gc_min_interval;