diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-07-13 15:15:43 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-07-13 15:15:43 -0400 |
| commit | 99ad25a313bda566a346b46a6015afa65bc0a02b (patch) | |
| tree | b9443fed1ab74f320c4ee0791864ee96d7c069df /net/xfrm | |
| parent | f62c4a96f74d6c6dd56d1742697e94a5c2085e87 (diff) | |
| parent | 9a556e89081b0c1c2f83cee915363b15a68a6f2d (diff) | |
Auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'net/xfrm')
| -rw-r--r-- | net/xfrm/Kconfig | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/net/xfrm/Kconfig b/net/xfrm/Kconfig index 58ca6a972c..0c1c04322b 100644 --- a/net/xfrm/Kconfig +++ b/net/xfrm/Kconfig | |||
| @@ -1,6 +1,10 @@ | |||
| 1 | # | 1 | # |
| 2 | # XFRM configuration | 2 | # XFRM configuration |
| 3 | # | 3 | # |
| 4 | config XFRM | ||
| 5 | bool | ||
| 6 | depends on NET | ||
| 7 | |||
| 4 | config XFRM_USER | 8 | config XFRM_USER |
| 5 | tristate "IPsec user configuration interface" | 9 | tristate "IPsec user configuration interface" |
| 6 | depends on INET && XFRM | 10 | depends on INET && XFRM |
| @@ -10,3 +14,14 @@ config XFRM_USER | |||
| 10 | 14 | ||
| 11 | If unsure, say Y. | 15 | If unsure, say Y. |
| 12 | 16 | ||
| 17 | config NET_KEY | ||
| 18 | tristate "PF_KEY sockets" | ||
| 19 | select XFRM | ||
| 20 | ---help--- | ||
| 21 | PF_KEYv2 socket family, compatible to KAME ones. | ||
| 22 | They are required if you are going to use IPsec tools ported | ||
| 23 | from KAME. | ||
| 24 | |||
| 25 | Say Y unless you know what you are doing. | ||
| 26 | |||
| 27 | |||