diff options
author | David S. Miller <davem@davemloft.net> | 2011-02-01 18:30:56 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-02-01 18:35:25 -0500 |
commit | 5348ba85a02ffe80a8af33a524b6610966760d3d (patch) | |
tree | 37e2fd7f990692508906cfcabc0b7d7500e087ef /net/ipv4/fib_frontend.c | |
parent | 3630b7c050d9c3564f143d595339fc06b888d6f3 (diff) |
ipv4: Update some fib_hash centric interface names.
fib_hash_init() --> fib_trie_init()
fib_hash_table() --> fib_trie_table()
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/fib_frontend.c')
-rw-r--r-- | net/ipv4/fib_frontend.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c index 930768ba49af..2a49c061b34c 100644 --- a/net/ipv4/fib_frontend.c +++ b/net/ipv4/fib_frontend.c | |||
@@ -51,11 +51,11 @@ static int __net_init fib4_rules_init(struct net *net) | |||
51 | { | 51 | { |
52 | struct fib_table *local_table, *main_table; | 52 | struct fib_table *local_table, *main_table; |
53 | 53 | ||
54 | local_table = fib_hash_table(RT_TABLE_LOCAL); | 54 | local_table = fib_trie_table(RT_TABLE_LOCAL); |
55 | if (local_table == NULL) | 55 | if (local_table == NULL) |
56 | return -ENOMEM; | 56 | return -ENOMEM; |
57 | 57 | ||
58 | main_table = fib_hash_table(RT_TABLE_MAIN); | 58 | main_table = fib_trie_table(RT_TABLE_MAIN); |
59 | if (main_table == NULL) | 59 | if (main_table == NULL) |
60 | goto fail; | 60 | goto fail; |
61 | 61 | ||
@@ -82,7 +82,7 @@ struct fib_table *fib_new_table(struct net *net, u32 id) | |||
82 | if (tb) | 82 | if (tb) |
83 | return tb; | 83 | return tb; |
84 | 84 | ||
85 | tb = fib_hash_table(id); | 85 | tb = fib_trie_table(id); |
86 | if (!tb) | 86 | if (!tb) |
87 | return NULL; | 87 | return NULL; |
88 | h = id & (FIB_TABLE_HASHSZ - 1); | 88 | h = id & (FIB_TABLE_HASHSZ - 1); |
@@ -1086,5 +1086,5 @@ void __init ip_fib_init(void) | |||
1086 | register_netdevice_notifier(&fib_netdev_notifier); | 1086 | register_netdevice_notifier(&fib_netdev_notifier); |
1087 | register_inetaddr_notifier(&fib_inetaddr_notifier); | 1087 | register_inetaddr_notifier(&fib_inetaddr_notifier); |
1088 | 1088 | ||
1089 | fib_hash_init(); | 1089 | fib_trie_init(); |
1090 | } | 1090 | } |