Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5348ba85 authored by David S. Miller's avatar David S. Miller
Browse files

ipv4: Update some fib_hash centric interface names. 



fib_hash_init() --> fib_trie_init()
fib_hash_table() --> fib_trie_table()

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3630b7c0

include/net/ip_fib.h

+3 −3
Original line number Original line Diff line number Diff line
@@ -228,9 +228,9 @@ extern int fib_sync_up(struct net_device *dev); 
extern __be32  __fib_res_prefsrc(struct fib_result *res);

extern __be32  __fib_res_prefsrc(struct fib_result *res);

extern void fib_select_multipath(const struct flowi *flp, struct fib_result *res);

extern void fib_select_multipath(const struct flowi *flp, struct fib_result *res);





/* Exported by fib_{hash|trie}.c */

/* Exported by fib_trie.c */

extern void fib_hash_init(void);

extern void fib_trie_init(void);

extern struct fib_table *fib_hash_table(u32 id);

extern struct fib_table *fib_trie_table(u32 id);





static inline void fib_combine_itag(u32 *itag, struct fib_result *res)

static inline void fib_combine_itag(u32 *itag, struct fib_result *res)

{

{

net/ipv4/fib_frontend.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -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();

}
 
}

net/ipv4/fib_trie.c

+2 −3
Original line number Original line Diff line number Diff line
@@ -1916,7 +1916,7 @@ int fib_table_dump(struct fib_table *tb, struct sk_buff *skb, 
	return skb->len;

	return skb->len;

}

}





void __init fib_hash_init(void)

void __init fib_trie_init(void)

{

{

	fn_alias_kmem = kmem_cache_create("ip_fib_alias",

	fn_alias_kmem = kmem_cache_create("ip_fib_alias",

					  sizeof(struct fib_alias),

					  sizeof(struct fib_alias),
@@ -1929,8 +1929,7 @@ void __init fib_hash_init(void) 
}

}









/* Fix more generic FIB names for init later */

struct fib_table *fib_trie_table(u32 id)

struct fib_table *fib_hash_table(u32 id)

{

{

	struct fib_table *tb;

	struct fib_table *tb;

	struct trie *t;

	struct trie *t;