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

Commit 7e5449c2 authored by Daniel Lezcano's avatar Daniel Lezcano Committed by David S. Miller
Browse files

[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: default avatarDaniel Lezcano <dlezcano@fr.ibm.com>
Acked-by: default avatarYOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c35b7e72

include/net/ip6_fib.h

+11 −1
Original line number Diff line number Diff line
@@ -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

net/ipv6/route.c

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