4 files changed, 28 insertions, 26 deletions

diff --git a/include/net/ip_fib.h b/include/net/ip_fib.h
index 025b225181e1..f580542f08ed 100644
--- a/include/net/ip_fib.h
+++ b/include/net/ip_fib.h
@@ -231,8 +231,9 @@ extern int fib_sync_down(__be32 local, struct net_device *dev, int force);
 extern int fib_sync_up(struct net_device *dev);
 extern __be32  __fib_res_prefsrc(struct fib_result *res);
 
-/* Exported by fib_hash.c */
-extern struct fib_table *fib_hash_init(u32 id);
+/* Exported by fib_{hash|trie}.c */
+extern void fib_hash_init(void);
+extern struct fib_table *fib_hash_table(u32 id);
 
 static inline void fib_combine_itag(u32 *itag, struct fib_result *res)
 {
diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c
index 02b5ff73357f..8ddcd3f91a17 100644
--- a/net/ipv4/fib_frontend.c
+++ b/net/ipv4/fib_frontend.c
@@ -53,11 +53,11 @@ static int __net_init fib4_rules_init(struct net *net)
 {
         struct fib_table *local_table, *main_table;
 
-        local_table = fib_hash_init(RT_TABLE_LOCAL);
+        local_table = fib_hash_table(RT_TABLE_LOCAL);
         if (local_table == NULL)
                 return -ENOMEM;
 
-        main_table  = fib_hash_init(RT_TABLE_MAIN);
+        main_table  = fib_hash_table(RT_TABLE_MAIN);
         if (main_table == NULL)
                 goto fail;
 
@@ -83,7 +83,8 @@ struct fib_table *fib_new_table(struct net *net, u32 id)
         tb = fib_get_table(net, id);
         if (tb)
                 return tb;
-        tb = fib_hash_init(id);
+
+        tb = fib_hash_table(id);
         if (!tb)
                 return NULL;
         h = id & (FIB_TABLE_HASHSZ - 1);
@@ -1042,6 +1043,8 @@ void __init ip_fib_init(void)
         register_pernet_subsys(&fib_net_ops);
         register_netdevice_notifier(&fib_netdev_notifier);
         register_inetaddr_notifier(&fib_inetaddr_notifier);
+
+        fib_hash_init();
 }
 
 EXPORT_SYMBOL(inet_addr_type);
diff --git a/net/ipv4/fib_hash.c b/net/ipv4/fib_hash.c
index 258214f57fba..499522f3b305 100644
--- a/net/ipv4/fib_hash.c
+++ b/net/ipv4/fib_hash.c
@@ -747,21 +747,19 @@ static int fn_hash_dump(struct fib_table *tb, struct sk_buff *skb, struct netlin
         return skb->len;
 }
 
-struct fib_table *fib_hash_init(u32 id)
+void __init fib_hash_init(void)
 {
-        struct fib_table *tb;
+        fn_hash_kmem = kmem_cache_create("ip_fib_hash", sizeof(struct fib_node),
+                                         0, SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL);
+
+        fn_alias_kmem = kmem_cache_create("ip_fib_alias", sizeof(struct fib_alias),
+                                          0, SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL);
+
+}
 
-        if (fn_hash_kmem == NULL)
-                fn_hash_kmem = kmem_cache_create("ip_fib_hash",
-                                                 sizeof(struct fib_node),
-                                                 0, SLAB_HWCACHE_ALIGN,
-                                                 NULL);
-
-        if (fn_alias_kmem == NULL)
-                fn_alias_kmem = kmem_cache_create("ip_fib_alias",
-                                                  sizeof(struct fib_alias),
-                                                  0, SLAB_HWCACHE_ALIGN,
-                                                  NULL);
+struct fib_table *fib_hash_table(u32 id)
+{
+        struct fib_table *tb;
 
         tb = kmalloc(sizeof(struct fib_table) + sizeof(struct fn_hash),
                      GFP_KERNEL);
diff --git a/net/ipv4/fib_trie.c b/net/ipv4/fib_trie.c
index a15cb0d2e113..fbc80d15827b 100644
--- a/net/ipv4/fib_trie.c
+++ b/net/ipv4/fib_trie.c
@@ -1926,19 +1926,19 @@ out:
         return -1;
 }
 
-/* Fix more generic FIB names for init later */
+void __init fib_hash_init(void)
+{
+        fn_alias_kmem = kmem_cache_create("ip_fib_alias", sizeof(struct fib_alias),
+                                          0, SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL);
+}
 
-struct fib_table *fib_hash_init(u32 id)
+
+/* Fix more generic FIB names for init later */
+struct fib_table *fib_hash_table(u32 id)
 {
         struct fib_table *tb;
         struct trie *t;
 
-        if (fn_alias_kmem == NULL)
-                fn_alias_kmem = kmem_cache_create("ip_fib_alias",
-                                                  sizeof(struct fib_alias),
-                                                  0, SLAB_HWCACHE_ALIGN,
-                                                  NULL);
-
         tb = kmalloc(sizeof(struct fib_table) + sizeof(struct trie),
                      GFP_KERNEL);
         if (tb == NULL)