[NETNS][IPV6] rt6_info - move rt6_info structure inside the namespace

The rt6_info structures are moved inside the network namespace
structure. All references to these structures are now relative to the
initial network namespace.

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, 5 insertions, 1 deletions

diff --git a/include/net/ip6_fib.h b/include/net/ip6_fib.h
index fae267f65341..7c5c0f79168a 100644
--- a/include/net/ip6_fib.h
+++ b/include/net/ip6_fib.h
@@ -174,7 +174,8 @@ struct fib6_table {
 #define RT6_TABLE_LOCAL         RT6_TABLE_MAIN
 #endif
 
-typedef struct rt6_info *(*pol_lookup_t)(struct fib6_table *,
+typedef struct rt6_info *(*pol_lookup_t)(struct net *,
+                                         struct fib6_table *,
                                          struct flowi *, int);
 
 /*
diff --git a/include/net/netns/ipv6.h b/include/net/netns/ipv6.h
index c6c9afff13ef..311a942f36e9 100644
--- a/include/net/netns/ipv6.h
+++ b/include/net/netns/ipv6.h
@@ -36,11 +36,14 @@ struct netns_ipv6 {
         struct xt_table         *ip6table_mangle;
         struct xt_table         *ip6table_raw;
 #endif
+        struct rt6_info         *ip6_null_entry;
         struct rt6_statistics   *rt6_stats;
         struct timer_list       *ip6_fib_timer;
         struct hlist_head       *fib_table_hash;
         struct fib6_table       *fib6_main_tbl;
 #ifdef CONFIG_IPV6_MULTIPLE_TABLES
+        struct rt6_info         *ip6_prohibit_entry;
+        struct rt6_info         *ip6_blk_hole_entry;
         struct fib6_table       *fib6_local_tbl;
         struct fib_rules_ops    *fib6_rules_ops;
 #endif