5 files changed, 17 insertions, 9 deletions

diff --git a/net/ipv4/Kconfig b/net/ipv4/Kconfig
index d183262943d9..2c8febd3ebda 100644
--- a/net/ipv4/Kconfig
+++ b/net/ipv4/Kconfig
@@ -312,7 +312,7 @@ config SYN_COOKIES
 
 config INET_AH
         tristate "IP: AH transformation"
-        select XFRM
+        select XFRM_ALGO
         select CRYPTO
         select CRYPTO_HMAC
         select CRYPTO_MD5
@@ -324,7 +324,7 @@ config INET_AH
 
 config INET_ESP
         tristate "IP: ESP transformation"
-        select XFRM
+        select XFRM_ALGO
         select CRYPTO
         select CRYPTO_AUTHENC
         select CRYPTO_HMAC
diff --git a/net/ipv6/Kconfig b/net/ipv6/Kconfig
index 36d7437ac054..5728695b5449 100644
--- a/net/ipv6/Kconfig
+++ b/net/ipv6/Kconfig
@@ -69,7 +69,7 @@ config IPV6_OPTIMISTIC_DAD
 
 config INET6_AH
         tristate "IPv6: AH transformation"
-        select XFRM
+        select XFRM_ALGO
         select CRYPTO
         select CRYPTO_HMAC
         select CRYPTO_MD5
@@ -81,7 +81,7 @@ config INET6_AH
 
 config INET6_ESP
         tristate "IPv6: ESP transformation"
-        select XFRM
+        select XFRM_ALGO
         select CRYPTO
         select CRYPTO_AUTHENC
         select CRYPTO_HMAC
diff --git a/net/xfrm/Kconfig b/net/xfrm/Kconfig
index 6d081674515f..ce90b8d92365 100644
--- a/net/xfrm/Kconfig
+++ b/net/xfrm/Kconfig
@@ -3,12 +3,17 @@
 #
 config XFRM
        bool
-       select CRYPTO
        depends on NET
 
+config XFRM_ALGO
+        tristate
+        select XFRM
+        select CRYPTO
+
 config XFRM_USER
         tristate "Transformation user configuration interface"
-        depends on INET && XFRM
+        depends on INET
+        select XFRM_ALGO
         ---help---
           Support for Transformation(XFRM) user configuration interface
           like IPsec used by native Linux tools.
@@ -48,13 +53,13 @@ config XFRM_STATISTICS
 
 config XFRM_IPCOMP
         tristate
-        select XFRM
+        select XFRM_ALGO
         select CRYPTO
         select CRYPTO_DEFLATE
 
 config NET_KEY
         tristate "PF_KEY sockets"
-        select XFRM
+        select XFRM_ALGO
         ---help---
           PF_KEYv2 socket family, compatible to KAME ones.
           They are required if you are going to use IPsec tools ported
diff --git a/net/xfrm/Makefile b/net/xfrm/Makefile
index aa429eefe919..c0e961983f17 100644
--- a/net/xfrm/Makefile
+++ b/net/xfrm/Makefile
@@ -3,8 +3,9 @@
 #
 
 obj-$(CONFIG_XFRM) := xfrm_policy.o xfrm_state.o xfrm_hash.o \
-                      xfrm_input.o xfrm_output.o xfrm_algo.o \
+                      xfrm_input.o xfrm_output.o \
                       xfrm_sysctl.o xfrm_replay.o
 obj-$(CONFIG_XFRM_STATISTICS) += xfrm_proc.o
+obj-$(CONFIG_XFRM_ALGO) += xfrm_algo.o
 obj-$(CONFIG_XFRM_USER) += xfrm_user.o
 obj-$(CONFIG_XFRM_IPCOMP) += xfrm_ipcomp.o
diff --git a/net/xfrm/xfrm_algo.c b/net/xfrm/xfrm_algo.c
index 791ab2e77f3f..ecd6d8d8a66c 100644
--- a/net/xfrm/xfrm_algo.c
+++ b/net/xfrm/xfrm_algo.c
@@ -752,3 +752,5 @@ void *pskb_put(struct sk_buff *skb, struct sk_buff *tail, int len)
 }
 EXPORT_SYMBOL_GPL(pskb_put);
 #endif
+
+MODULE_LICENSE("GPL");