|
@@ -51,11 +51,11 @@ static int __net_init fib4_rules_init(struct net *net)
|
|
{
|
|
{
|
|
struct fib_table *local_table, *main_table;
|
|
struct fib_table *local_table, *main_table;
|
|
|
|
|
|
- local_table = fib_hash_table(RT_TABLE_LOCAL);
|
|
|
|
|
|
+ local_table = fib_trie_table(RT_TABLE_LOCAL);
|
|
if (local_table == NULL)
|
|
if (local_table == NULL)
|
|
return -ENOMEM;
|
|
return -ENOMEM;
|
|
|
|
|
|
- main_table = fib_hash_table(RT_TABLE_MAIN);
|
|
|
|
|
|
+ main_table = fib_trie_table(RT_TABLE_MAIN);
|
|
if (main_table == NULL)
|
|
if (main_table == NULL)
|
|
goto fail;
|
|
goto fail;
|
|
|
|
|
|
@@ -82,7 +82,7 @@ struct fib_table *fib_new_table(struct net *net, u32 id)
|
|
if (tb)
|
|
if (tb)
|
|
return tb;
|
|
return tb;
|
|
|
|
|
|
- tb = fib_hash_table(id);
|
|
|
|
|
|
+ tb = fib_trie_table(id);
|
|
if (!tb)
|
|
if (!tb)
|
|
return NULL;
|
|
return NULL;
|
|
h = id & (FIB_TABLE_HASHSZ - 1);
|
|
h = id & (FIB_TABLE_HASHSZ - 1);
|
|
@@ -1086,5 +1086,5 @@ void __init ip_fib_init(void)
|
|
register_netdevice_notifier(&fib_netdev_notifier);
|
|
register_netdevice_notifier(&fib_netdev_notifier);
|
|
register_inetaddr_notifier(&fib_inetaddr_notifier);
|
|
register_inetaddr_notifier(&fib_inetaddr_notifier);
|
|
|
|
|
|
- fib_hash_init();
|
|
|
|
|
|
+ fib_trie_init();
|
|
}
|
|
}
|