diff options
| author | Pavel Emelyanov <xemul@openvz.org> | 2007-11-06 23:34:04 -0800 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2007-11-07 04:11:41 -0800 |
| commit | c3e9a353d8fc64a82ab11a07e21902e25e1e96d1 (patch) | |
| tree | 222e2a21bcceeb22818543029682fc94feb70f9d /include | |
| parent | 6a9a025086ac70f0f285365cbaf1df8643266b72 (diff) | |
| download | op-kernel-dev-c3e9a353d8fc64a82ab11a07e21902e25e1e96d1.zip op-kernel-dev-c3e9a353d8fc64a82ab11a07e21902e25e1e96d1.tar.gz | |
[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: Pavel Emelyanov <xemul@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/ip_fib.h | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/include/net/ip_fib.h b/include/net/ip_fib.h index 8cadc77..ed514bf 100644 --- a/include/net/ip_fib.h +++ b/include/net/ip_fib.h @@ -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 |
