Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 5348ba85a02ffe80a8af33a524b6610966760d3d

Authored by David S. Miller
1 parent 3630b7c050
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

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>

Showing 3 changed files with 9 additions and 10 deletions Side-by-side Diff

include/net/ip_fib.h
Diff comments   View file @ 5348ba8
... ... @@ -228,9 +228,9 @@
228 228 extern __be32 __fib_res_prefsrc(struct fib_result *res);
229 229 extern void fib_select_multipath(const struct flowi *flp, struct fib_result *res);
230 230  
231   -/* Exported by fib_{hash|trie}.c */
232   -extern void fib_hash_init(void);
233   -extern struct fib_table *fib_hash_table(u32 id);
  231 +/* Exported by fib_trie.c */
  232 +extern void fib_trie_init(void);
  233 +extern struct fib_table *fib_trie_table(u32 id);
234 234  
235 235 static inline void fib_combine_itag(u32 *itag, struct fib_result *res)
236 236 {
net/ipv4/fib_frontend.c
Diff comments   View file @ 5348ba8
... ... @@ -51,11 +51,11 @@
51 51 {
52 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 55 if (local_table == NULL)
56 56 return -ENOMEM;
57 57  
58   - main_table = fib_hash_table(RT_TABLE_MAIN);
  58 + main_table = fib_trie_table(RT_TABLE_MAIN);
59 59 if (main_table == NULL)
60 60 goto fail;
61 61  
... ... @@ -82,7 +82,7 @@
82 82 if (tb)
83 83 return tb;
84 84  
85   - tb = fib_hash_table(id);
  85 + tb = fib_trie_table(id);
86 86 if (!tb)
87 87 return NULL;
88 88 h = id & (FIB_TABLE_HASHSZ - 1);
... ... @@ -1086,6 +1086,6 @@
1086 1086 register_netdevice_notifier(&fib_netdev_notifier);
1087 1087 register_inetaddr_notifier(&fib_inetaddr_notifier);
1088 1088  
1089   - fib_hash_init();
  1089 + fib_trie_init();
1090 1090 }
... ... @@ -1916,7 +1916,7 @@
1916 1916 return skb->len;
1917 1917 }
1918 1918  
1919   -void __init fib_hash_init(void)
  1919 +void __init fib_trie_init(void)
1920 1920 {
1921 1921 fn_alias_kmem = kmem_cache_create("ip_fib_alias",
1922 1922 sizeof(struct fib_alias),
... ... @@ -1929,8 +1929,7 @@
1929 1929 }
1930 1930  
1931 1931  
1932   -/* Fix more generic FIB names for init later */
1933   -struct fib_table *fib_hash_table(u32 id)
  1932 +struct fib_table *fib_trie_table(u32 id)
1934 1933 {
1935 1934 struct fib_table *tb;
1936 1935 struct trie *t;