[IPV6]: remove ifdef in route6 for xfrm6
The following patch create the usual static inline functions to disable
the xfrm6_init and xfrm6_fini function when XFRM is off.
That's allow to remove some ifdef 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>
diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index dbdae14..c4e890a 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -2522,11 +2522,10 @@
if (ret)
goto out_fib6_init;
-#ifdef CONFIG_XFRM
ret = xfrm6_init();
if (ret)
goto out_proc_init;
-#endif
+
#ifdef CONFIG_IPV6_MULTIPLE_TABLES
ret = fib6_rules_init();
if (ret)
@@ -2547,9 +2546,7 @@
fib6_rules_cleanup();
xfrm6_init:
#endif
-#ifdef CONFIG_XFRM
xfrm6_fini();
-#endif
out_proc_init:
ipv6_route_proc_fini(&init_net);
out_fib6_init:
@@ -2566,9 +2563,7 @@
fib6_rules_cleanup();
#endif
ipv6_route_proc_fini(&init_net);
-#ifdef CONFIG_XFRM
xfrm6_fini();
-#endif
rt6_ifdown(NULL);
fib6_gc_cleanup();
kmem_cache_destroy(ip6_dst_ops.kmem_cachep);