diff options
author | Jan Beulich <JBeulich@suse.com> | 2012-05-14 21:57:44 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-05-15 13:13:34 -0400 |
commit | 7e1525249814acfd293d579abcb6462767643a8a (patch) | |
tree | dfb4e6963b9a0e179475c7026bd812bd5b293149 /net/xfrm/Kconfig | |
parent | bcebe55957323d9a5bc9d0f7a0747ccbb34c86dd (diff) |
xfrm: make xfrm_algo.c a module
By making this a standalone config option (auto-selected as needed),
selecting CRYPTO from here rather than from XFRM (which is boolean)
allows the core crypto code to become a module again even when XFRM=y.
Signed-off-by: Jan Beulich <jbeulich@suse.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/xfrm/Kconfig')
-rw-r--r-- | net/xfrm/Kconfig | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/net/xfrm/Kconfig b/net/xfrm/Kconfig index 6d081674515..ce90b8d9236 100644 --- a/net/xfrm/Kconfig +++ b/net/xfrm/Kconfig | |||
@@ -3,12 +3,17 @@ | |||
3 | # | 3 | # |
4 | config XFRM | 4 | config XFRM |
5 | bool | 5 | bool |
6 | select CRYPTO | ||
7 | depends on NET | 6 | depends on NET |
8 | 7 | ||
8 | config XFRM_ALGO | ||
9 | tristate | ||
10 | select XFRM | ||
11 | select CRYPTO | ||
12 | |||
9 | config XFRM_USER | 13 | config XFRM_USER |
10 | tristate "Transformation user configuration interface" | 14 | tristate "Transformation user configuration interface" |
11 | depends on INET && XFRM | 15 | depends on INET |
16 | select XFRM_ALGO | ||
12 | ---help--- | 17 | ---help--- |
13 | Support for Transformation(XFRM) user configuration interface | 18 | Support for Transformation(XFRM) user configuration interface |
14 | like IPsec used by native Linux tools. | 19 | like IPsec used by native Linux tools. |
@@ -48,13 +53,13 @@ config XFRM_STATISTICS | |||
48 | 53 | ||
49 | config XFRM_IPCOMP | 54 | config XFRM_IPCOMP |
50 | tristate | 55 | tristate |
51 | select XFRM | 56 | select XFRM_ALGO |
52 | select CRYPTO | 57 | select CRYPTO |
53 | select CRYPTO_DEFLATE | 58 | select CRYPTO_DEFLATE |
54 | 59 | ||
55 | config NET_KEY | 60 | config NET_KEY |
56 | tristate "PF_KEY sockets" | 61 | tristate "PF_KEY sockets" |
57 | select XFRM | 62 | select XFRM_ALGO |
58 | ---help--- | 63 | ---help--- |
59 | PF_KEYv2 socket family, compatible to KAME ones. | 64 | PF_KEYv2 socket family, compatible to KAME ones. |
60 | They are required if you are going to use IPsec tools ported | 65 | They are required if you are going to use IPsec tools ported |