Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee13...

[linux-2.6] / net / xfrm / Kconfig

diff --git a/net/xfrm/Kconfig b/net/xfrm/Kconfig
index 43228f7fd3a055dc414f797dd1edb7489dc10790..0faab6332586a3dd7af013196e9cf998f690a3ec 100644 (file)
--- a/net/xfrm/Kconfig
+++ b/net/xfrm/Kconfig
@@ -14,6 +14,16 @@ config XFRM_USER
 
          If unsure, say Y.
 
+config XFRM_SUB_POLICY
+       bool "Transformation sub policy support (EXPERIMENTAL)"
+       depends on XFRM && EXPERIMENTAL
+       ---help---
+         Support sub policy for developers. By using sub policy with main
+         one, two policies can be applied to the same packet at once.
+         Policy which lives shorter time in kernel should be a sub.
+
+         If unsure, say N.
+
 config NET_KEY
        tristate "PF_KEY sockets"
        select XFRM