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

Commit c3e9a353 authored by Pavel Emelyanov's avatar Pavel Emelyanov Committed by David S. Miller
Browse files

[IPV4]: Compact some ifdefs in the fib code. 



There are places that check for CONFIG_IP_MULTIPLE_TABLES
twice in the same file, but the internals of these #ifdefs
can be merged.

As a side effect - remove one ifdef from inside a function.

Signed-off-by: default avatarPavel Emelyanov <xemul@openvz.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6a9a0250

include/net/ip_fib.h

+6 −9
Original line number Diff line number Diff line
@@ -185,6 +185,12 @@ static inline void fib_select_default(const struct flowi *flp, struct fib_result 
}



#else /* CONFIG_IP_MULTIPLE_TABLES */

extern void __init fib4_rules_init(void);



#ifdef CONFIG_NET_CLS_ROUTE

extern u32 fib_rules_tclass(struct fib_result *res);

#endif



#define ip_fib_local_table fib_get_table(RT_TABLE_LOCAL)

#define ip_fib_main_table fib_get_table(RT_TABLE_MAIN)
@@ -214,15 +220,6 @@ extern __be32 __fib_res_prefsrc(struct fib_result *res); 
/* Exported by fib_hash.c */

extern struct fib_table *fib_hash_init(u32 id);



#ifdef CONFIG_IP_MULTIPLE_TABLES

extern void __init fib4_rules_init(void);



#ifdef CONFIG_NET_CLS_ROUTE

extern u32 fib_rules_tclass(struct fib_result *res);

#endif



#endif



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

{

#ifdef CONFIG_NET_CLS_ROUTE

net/ipv4/fib_frontend.c

+8 −7
Original line number Diff line number Diff line
@@ -59,6 +59,13 @@ struct fib_table *ip_fib_main_table; 
#define FIB_TABLE_HASHSZ 1

static struct hlist_head fib_table_hash[FIB_TABLE_HASHSZ];



static void __init fib4_rules_init(void)

{

	ip_fib_local_table = fib_hash_init(RT_TABLE_LOCAL);

	hlist_add_head_rcu(&ip_fib_local_table->tb_hlist, &fib_table_hash[0]);

	ip_fib_main_table  = fib_hash_init(RT_TABLE_MAIN);

	hlist_add_head_rcu(&ip_fib_main_table->tb_hlist, &fib_table_hash[0]);

}

#else



#define FIB_TABLE_HASHSZ 256
@@ -905,14 +912,8 @@ void __init ip_fib_init(void) 


	for (i = 0; i < FIB_TABLE_HASHSZ; i++)

		INIT_HLIST_HEAD(&fib_table_hash[i]);

#ifndef CONFIG_IP_MULTIPLE_TABLES

	ip_fib_local_table = fib_hash_init(RT_TABLE_LOCAL);

	hlist_add_head_rcu(&ip_fib_local_table->tb_hlist, &fib_table_hash[0]);

	ip_fib_main_table  = fib_hash_init(RT_TABLE_MAIN);

	hlist_add_head_rcu(&ip_fib_main_table->tb_hlist, &fib_table_hash[0]);

#else



	fib4_rules_init();

#endif



	register_netdevice_notifier(&fib_netdev_notifier);

	register_inetaddr_notifier(&fib_inetaddr_notifier);