|
@@ -2557,14 +2557,16 @@ static
|
|
int ipv6_sysctl_rtcache_flush(ctl_table *ctl, int write,
|
|
int ipv6_sysctl_rtcache_flush(ctl_table *ctl, int write,
|
|
void __user *buffer, size_t *lenp, loff_t *ppos)
|
|
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;
|
|
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[] = {
|
|
ctl_table ipv6_route_table_template[] = {
|
|
@@ -2651,6 +2653,7 @@ struct ctl_table * __net_init ipv6_route_sysctl_init(struct net *net)
|
|
|
|
|
|
if (table) {
|
|
if (table) {
|
|
table[0].data = &net->ipv6.sysctl.flush_delay;
|
|
table[0].data = &net->ipv6.sysctl.flush_delay;
|
|
|
|
+ table[0].extra1 = net;
|
|
table[1].data = &net->ipv6.ip6_dst_ops.gc_thresh;
|
|
table[1].data = &net->ipv6.ip6_dst_ops.gc_thresh;
|
|
table[2].data = &net->ipv6.sysctl.ip6_rt_max_size;
|
|
table[2].data = &net->ipv6.sysctl.ip6_rt_max_size;
|
|
table[3].data = &net->ipv6.sysctl.ip6_rt_gc_min_interval;
|
|
table[3].data = &net->ipv6.sysctl.ip6_rt_gc_min_interval;
|