diff options
author | Herbert Xu <herbert@gondor.apana.org.au> | 2008-07-25 05:54:40 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-07-25 05:54:40 -0400 |
commit | 6fccab671f2f0a24b799f29a4ec878f62d34656c (patch) | |
tree | e90a1ac0770f8fe59bd7c8768663052a7756b950 /net/xfrm/Kconfig | |
parent | cffe1c5d7a5a1e54f7c2c6d0510f651a965bccc3 (diff) |
ipsec: ipcomp - Merge IPComp implementations
This patch merges the IPv4/IPv6 IPComp implementations since most
of the code is identical. As a result future enhancements will no
longer need to be duplicated.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/xfrm/Kconfig')
-rw-r--r-- | net/xfrm/Kconfig | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/net/xfrm/Kconfig b/net/xfrm/Kconfig index 9201ef8ad90e..6d081674515f 100644 --- a/net/xfrm/Kconfig +++ b/net/xfrm/Kconfig | |||
@@ -46,6 +46,12 @@ config XFRM_STATISTICS | |||
46 | 46 | ||
47 | If unsure, say N. | 47 | If unsure, say N. |
48 | 48 | ||
49 | config XFRM_IPCOMP | ||
50 | tristate | ||
51 | select XFRM | ||
52 | select CRYPTO | ||
53 | select CRYPTO_DEFLATE | ||
54 | |||
49 | config NET_KEY | 55 | config NET_KEY |
50 | tristate "PF_KEY sockets" | 56 | tristate "PF_KEY sockets" |
51 | select XFRM | 57 | select XFRM |