aboutsummaryrefslogtreecommitdiffstats
path: root/net/xfrm
diff options
context:
space:
mode:
authorSebastian Siewior <sebastian@breakpoint.cc>2008-01-09 03:36:17 -0500
committerDavid S. Miller <davem@davemloft.net>2008-01-28 18:01:12 -0500
commit50dd79653e295ce40da38c03bbfb5966aa1c1598 (patch)
treec96cee5292a6d335978d578043a6c436d42e7ad3 /net/xfrm
parent06eaa1a01d033bd5fd298b010334034f93021fbe (diff)
[XFRM]: Remove ifdef crypto.
and select the crypto subsystem if neccessary Signed-off-by: Sebastian Siewior <sebastian@breakpoint.cc> Acked-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/xfrm')
-rw-r--r--net/xfrm/Kconfig1
-rw-r--r--net/xfrm/xfrm_algo.c2
2 files changed, 1 insertions, 2 deletions
diff --git a/net/xfrm/Kconfig b/net/xfrm/Kconfig
index 6b5b50f427fc..8f9dbec319be 100644
--- a/net/xfrm/Kconfig
+++ b/net/xfrm/Kconfig
@@ -3,6 +3,7 @@
3# 3#
4config XFRM 4config XFRM
5 bool 5 bool
6 select CRYPTO
6 depends on NET 7 depends on NET
7 8
8config XFRM_USER 9config XFRM_USER
diff --git a/net/xfrm/xfrm_algo.c b/net/xfrm/xfrm_algo.c
index 1686f64c4352..b5c5347aed66 100644
--- a/net/xfrm/xfrm_algo.c
+++ b/net/xfrm/xfrm_algo.c
@@ -486,7 +486,6 @@ EXPORT_SYMBOL_GPL(xfrm_ealg_get_byidx);
486 */ 486 */
487void xfrm_probe_algs(void) 487void xfrm_probe_algs(void)
488{ 488{
489#ifdef CONFIG_CRYPTO
490 int i, status; 489 int i, status;
491 490
492 BUG_ON(in_softirq()); 491 BUG_ON(in_softirq());
@@ -511,7 +510,6 @@ void xfrm_probe_algs(void)
511 if (calg_list[i].available != status) 510 if (calg_list[i].available != status)
512 calg_list[i].available = status; 511 calg_list[i].available = status;
513 } 512 }
514#endif
515} 513}
516EXPORT_SYMBOL_GPL(xfrm_probe_algs); 514EXPORT_SYMBOL_GPL(xfrm_probe_algs);
517 515