diff options
| author | Daniel Lezcano <dlezcano@fr.ibm.com> | 2007-12-08 00:14:54 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-01-28 14:56:59 -0800 |
| commit | 7e5449c21562f1554d2c355db1ec9d3e4f434288 (patch) | |
| tree | 96e0eede0ade3339b6d4e202f77e4eecf658da4b | |
| parent | c35b7e72cd48bc7163b6900fb3689fa54b572bba (diff) | |
| download | linux-7e5449c21562f1554d2c355db1ec9d3e4f434288.tar.gz linux-7e5449c21562f1554d2c355db1ec9d3e4f434288.tar.bz2 linux-7e5449c21562f1554d2c355db1ec9d3e4f434288.zip | |
[IPV6]: route6 remove ifdef for fib_rules
The patch defines the usual static inline functions when the code is
disabled for fib6_rules. That's allow to remove some ifdef in route.c
file and make the code a little more clear.
Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
Acked-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | include/net/ip6_fib.h | 12 | ||||
| -rw-r--r-- | net/ipv6/route.c | 7 |
2 files changed, 12 insertions, 7 deletions
diff --git a/include/net/ip6_fib.h b/include/net/ip6_fib.h index eaa315868792..14830edc2ac0 100644 --- a/include/net/ip6_fib.h +++ b/include/net/ip6_fib.h @@ -226,8 +226,18 @@ extern void fib6_gc_cleanup(void); extern int fib6_init(void); +#ifdef CONFIG_IPV6_MULTIPLE_TABLES extern int fib6_rules_init(void); extern void fib6_rules_cleanup(void); - +#else +static inline int fib6_rules_init(void) +{ + return 0; +} +static inline void fib6_rules_cleanup(void) +{ + return ; +} +#endif #endif #endif diff --git a/net/ipv6/route.c b/net/ipv6/route.c index c4e890abb2d4..11ef456d67c5 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c @@ -2526,11 +2526,10 @@ int __init ip6_route_init(void) if (ret) goto out_proc_init; -#ifdef CONFIG_IPV6_MULTIPLE_TABLES ret = fib6_rules_init(); if (ret) goto xfrm6_init; -#endif + ret = -ENOBUFS; if (__rtnl_register(PF_INET6, RTM_NEWROUTE, inet6_rtm_newroute, NULL) || __rtnl_register(PF_INET6, RTM_DELROUTE, inet6_rtm_delroute, NULL) || @@ -2542,10 +2541,8 @@ out: return ret; fib6_rules_init: -#ifdef CONFIG_IPV6_MULTIPLE_TABLES fib6_rules_cleanup(); xfrm6_init: -#endif xfrm6_fini(); out_proc_init: ipv6_route_proc_fini(&init_net); @@ -2559,9 +2556,7 @@ out_kmem_cache: void ip6_route_cleanup(void) { -#ifdef CONFIG_IPV6_MULTIPLE_TABLES fib6_rules_cleanup(); -#endif ipv6_route_proc_fini(&init_net); xfrm6_fini(); rt6_ifdown(NULL); |