[NETNS][IPV6] ip6_fib - fib6_clean_all handle several network namespaces

[mirror_ubuntu-artful-kernel.git] / net / ipv6 / ip6_fib.c

diff --git a/net/ipv6/ip6_fib.c b/net/ipv6/ip6_fib.c
index 7b549f0bc428f180ae24d763e3285a2f76dc2197..0f9dc81f0e6193a5e2630fc6b51521b954ee85ff 100644 (file)
--- a/net/ipv6/ip6_fib.c
+++ b/net/ipv6/ip6_fib.c
@@ -1350,7 +1350,7 @@ static void fib6_clean_tree(struct fib6_node *root,
        fib6_walk(&c.w);
 }
 
-void fib6_clean_all(int (*func)(struct rt6_info *, void *arg),
+void fib6_clean_all(struct net *net, int (*func)(struct rt6_info *, void *arg),
                    int prune, void *arg)
 {
        struct fib6_table *table;
@@ -1360,7 +1360,7 @@ void fib6_clean_all(int (*func)(struct rt6_info *, void *arg),
 
        rcu_read_lock();
        for (h = 0; h < FIB_TABLE_HASHSZ; h++) {
-               head = &init_net.ipv6.fib_table_hash[h];
+               head = &net->ipv6.fib_table_hash[h];
                hlist_for_each_entry_rcu(table, node, head, tb6_hlist) {
                        write_lock_bh(&table->tb6_lock);
                        fib6_clean_tree(&table->tb6_root, func, prune, arg);
@@ -1450,7 +1450,8 @@ void fib6_run_gc(unsigned long dummy)
        gc_args.more = 0;
 
        icmp6_dst_gc(&gc_args.more);
-       fib6_clean_all(fib6_age, 0, NULL);
+
+       fib6_clean_all(&init_net, fib6_age, 0, NULL);
 
        if (gc_args.more)
                mod_timer(&ip6_fib_timer, jiffies +