Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[IPV6]: route6 remove ifdef for fib_rules

Browse source 
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>
This commit is contained in:
Daniel Lezcano 2007-12-08 00:14:54 -08:00 committed by David S. Miller
parent c35b7e72cd
commit 7e5449c215
2 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
include/net/ip6_fib.h
View file

@ -226,8 +226,18 @@ extern void fib6_gc_cleanup(void);
extern int fib6_init(void); extern int fib6_init(void);
#ifdef CONFIG_IPV6_MULTIPLE_TABLES
extern int fib6_rules_init(void); extern int fib6_rules_init(void);
extern void fib6_rules_cleanup(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
#endif #endif

7
net/ipv6/route.c
View file

@ -2526,11 +2526,10 @@ int __init ip6_route_init(void)
if (ret) if (ret)
goto out_proc_init; goto out_proc_init;
#ifdef CONFIG_IPV6_MULTIPLE_TABLES
ret = fib6_rules_init(); ret = fib6_rules_init();
if (ret) if (ret)
goto xfrm6_init; goto xfrm6_init;
#endif
ret = -ENOBUFS; ret = -ENOBUFS;
if (__rtnl_register(PF_INET6, RTM_NEWROUTE, inet6_rtm_newroute, NULL) || if (__rtnl_register(PF_INET6, RTM_NEWROUTE, inet6_rtm_newroute, NULL) ||
__rtnl_register(PF_INET6, RTM_DELROUTE, inet6_rtm_delroute, NULL) || __rtnl_register(PF_INET6, RTM_DELROUTE, inet6_rtm_delroute, NULL) ||
@ -2542,10 +2541,8 @@ int __init ip6_route_init(void)
return ret; return ret;
fib6_rules_init: fib6_rules_init:
#ifdef CONFIG_IPV6_MULTIPLE_TABLES
fib6_rules_cleanup(); fib6_rules_cleanup();
xfrm6_init: xfrm6_init:
#endif
xfrm6_fini(); xfrm6_fini();
out_proc_init: out_proc_init:
ipv6_route_proc_fini(&init_net); ipv6_route_proc_fini(&init_net);
@ -2559,9 +2556,7 @@ int __init ip6_route_init(void)
void ip6_route_cleanup(void) void ip6_route_cleanup(void)
{ {
#ifdef CONFIG_IPV6_MULTIPLE_TABLES
fib6_rules_cleanup(); fib6_rules_cleanup();
#endif
ipv6_route_proc_fini(&init_net); ipv6_route_proc_fini(&init_net);
xfrm6_fini(); xfrm6_fini();
rt6_ifdown(NULL); rt6_ifdown(NULL);