[NETNS][IPV6] ip6_fib - gc timer per namespace

Move the timer initialization at the network namespace creation and
store the network namespace in the timer argument.

That enables multiple timers (one per network namespace) to do garbage
collecting.

Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
Signed-off-by: Benjamin Thery <benjamin.thery@bull.net>
Signed-off-by: David S. Miller <davem@davemloft.net>

2 files changed, 2 insertions, 1 deletions

diff --git a/include/net/ip6_route.h b/include/net/ip6_route.h
index a158abe71933..79dce496f4d4 100644
--- a/include/net/ip6_route.h
+++ b/include/net/ip6_route.h
@@ -78,7 +78,7 @@ extern struct dst_entry *icmp6_dst_alloc(struct net_device *dev,
                                          struct in6_addr *addr);
 extern int icmp6_dst_gc(int *more);
 
-extern void fib6_force_start_gc(void);
+extern void fib6_force_start_gc(struct net *net);
 
 extern struct rt6_info *addrconf_dst_alloc(struct inet6_dev *idev,
                                            const struct in6_addr *addr,
diff --git a/include/net/netns/ipv6.h b/include/net/netns/ipv6.h
index b0653261c5a3..5279cd6a00ba 100644
--- a/include/net/netns/ipv6.h
+++ b/include/net/netns/ipv6.h
@@ -36,6 +36,7 @@ struct netns_ipv6 {
         struct xt_table         *ip6table_mangle;
         struct xt_table         *ip6table_raw;
 #endif
+        struct timer_list       *ip6_fib_timer;
         struct hlist_head       *fib_table_hash;
         struct fib6_table       *fib6_main_tbl;
 #ifdef CONFIG_IPV6_MULTIPLE_TABLES