[NETNS][IPV6] ip6_fib - make it per network namespace

The fib table for ipv6 are moved to the network namespace structure.
All references to them are made relatively to the network namespace.

All external calls to the ip6_fib functions taking the network
namespace parameter are made using the init_net variable, so the
ip6_fib engine is ready for the namespaces but the callers not yet.

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, 10 insertions, 4 deletions

diff --git a/include/net/ip6_fib.h b/include/net/ip6_fib.h
index 953d6040ff50..4d4c8aca8fb9 100644
--- a/include/net/ip6_fib.h
+++ b/include/net/ip6_fib.h
@@ -181,10 +181,11 @@ typedef struct rt6_info *(*pol_lookup_t)(struct fib6_table *,
  *      exported functions
  */
 
-extern struct fib6_table *      fib6_get_table(u32 id);
-extern struct fib6_table *      fib6_new_table(u32 id);
-extern struct dst_entry *       fib6_rule_lookup(struct flowi *fl, int flags,
-                                                 pol_lookup_t lookup);
+extern struct fib6_table        *fib6_get_table(struct net *net, u32 id);
+extern struct fib6_table        *fib6_new_table(struct net *net, u32 id);
+extern struct dst_entry         *fib6_rule_lookup(struct net *net,
+                                                  struct flowi *fl, int flags,
+                                                  pol_lookup_t lookup);
 
 extern struct fib6_node         *fib6_lookup(struct fib6_node *root,
                                              struct in6_addr *daddr,
diff --git a/include/net/netns/ipv6.h b/include/net/netns/ipv6.h
index 82623d3a8e35..b0653261c5a3 100644
--- a/include/net/netns/ipv6.h
+++ b/include/net/netns/ipv6.h
@@ -36,6 +36,11 @@ struct netns_ipv6 {
         struct xt_table         *ip6table_mangle;
         struct xt_table         *ip6table_raw;
 #endif
+        struct hlist_head       *fib_table_hash;
+        struct fib6_table       *fib6_main_tbl;
+#ifdef CONFIG_IPV6_MULTIPLE_TABLES
+        struct fib6_table       *fib6_local_tbl;
+#endif
         struct sock             **icmp_sk;
 };
 #endif