summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorDaniel Lezcano <dlezcano@fr.ibm.com>2008-03-03 23:31:11 -0800
committerDavid S. Miller <davem@davemloft.net>2008-03-03 23:31:11 -0800
commit63152fc0de4dfe83da543bf133cef73d885a50fc (patch)
tree2b6546f2ebd5b3fa6d48bfd7ca4085d0f96e771f /include
parent450d19f8ab35fad4ef2b129cb383a5b8d1326611 (diff)
downloadop-kernel-dev-63152fc0de4dfe83da543bf133cef73d885a50fc.zip
op-kernel-dev-63152fc0de4dfe83da543bf133cef73d885a50fc.tar.gz
[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>
Diffstat (limited to 'include')
-rw-r--r--include/net/ip6_route.h2
-rw-r--r--include/net/netns/ipv6.h1
2 files changed, 2 insertions, 1 deletions
diff --git a/include/net/ip6_route.h b/include/net/ip6_route.h
index a158abe..79dce49 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 b065326..5279cd6 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
OpenPOWER on IntegriCloud