From: Sebastian Siewior Date: Wed, 9 Jan 2008 08:36:17 +0000 (-0800) Subject: [XFRM]: Remove ifdef crypto. X-Git-Tag: v2.6.25-rc1~1162^2~827 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=50dd79653e295ce40da38c03bbfb5966aa1c1598;p=linux-2.6 [XFRM]: Remove ifdef crypto. and select the crypto subsystem if neccessary Signed-off-by: Sebastian Siewior Acked-by: Herbert Xu Signed-off-by: David S. Miller --- diff --git a/net/xfrm/Kconfig b/net/xfrm/Kconfig index 6b5b50f427..8f9dbec319 100644 --- a/net/xfrm/Kconfig +++ b/net/xfrm/Kconfig @@ -3,6 +3,7 @@ # config XFRM bool + select CRYPTO depends on NET config XFRM_USER diff --git a/net/xfrm/xfrm_algo.c b/net/xfrm/xfrm_algo.c index 1686f64c43..b5c5347aed 100644 --- a/net/xfrm/xfrm_algo.c +++ b/net/xfrm/xfrm_algo.c @@ -486,7 +486,6 @@ EXPORT_SYMBOL_GPL(xfrm_ealg_get_byidx); */ void xfrm_probe_algs(void) { -#ifdef CONFIG_CRYPTO int i, status; BUG_ON(in_softirq()); @@ -511,7 +510,6 @@ void xfrm_probe_algs(void) if (calg_list[i].available != status) calg_list[i].available = status; } -#endif } EXPORT_SYMBOL_GPL(xfrm_probe_algs);