Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc

[linux-2.6] / net / xfrm / Kconfig

diff --git a/net/xfrm/Kconfig b/net/xfrm/Kconfig
index d385a78694367476eb2cfdb574bf2891644d1536..6d081674515f0a7112580d1328c52bceda0386e5 100644 (file)
--- a/net/xfrm/Kconfig
+++ b/net/xfrm/Kconfig
@@ -3,6 +3,7 @@
 #
 config XFRM
        bool
+       select CRYPTO
        depends on NET
 
 config XFRM_USER
@@ -35,6 +36,22 @@ config XFRM_MIGRATE
 
          If unsure, say N.
 
+config XFRM_STATISTICS
+       bool "Transformation statistics (EXPERIMENTAL)"
+       depends on INET && XFRM && PROC_FS && EXPERIMENTAL
+       ---help---
+         This statistics is not a SNMP/MIB specification but shows
+         statistics about transformation error (or almost error) factor
+         at packet processing for developer.
+
+         If unsure, say N.
+
+config XFRM_IPCOMP
+       tristate
+       select XFRM
+       select CRYPTO
+       select CRYPTO_DEFLATE
+
 config NET_KEY
        tristate "PF_KEY sockets"
        select XFRM
@@ -45,4 +62,19 @@ config NET_KEY
 
          Say Y unless you know what you are doing.
 
+config NET_KEY_MIGRATE
+       bool "PF_KEY MIGRATE (EXPERIMENTAL)"
+       depends on NET_KEY && EXPERIMENTAL
+       select XFRM_MIGRATE
+       ---help---
+         Add a PF_KEY MIGRATE message to PF_KEYv2 socket family.
+         The PF_KEY MIGRATE message is used to dynamically update
+         locator(s) of a given IPsec security association.
+         This feature is required, for instance, in a Mobile IPv6
+         environment with IPsec configuration where mobile nodes
+         change their attachment point to the Internet.  Detail
+         information can be found in the internet-draft
+         <draft-sugimoto-mip6-pfkey-migrate>.
+
+         If unsure, say N.