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/ipv4/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/ipv4/Kconfig')
-rw-r--r-- | net/ipv4/Kconfig | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/net/ipv4/Kconfig b/net/ipv4/Kconfig index 4670683b4688..591ea23639ca 100644 --- a/net/ipv4/Kconfig +++ b/net/ipv4/Kconfig | |||
@@ -356,10 +356,8 @@ config INET_ESP | |||
356 | 356 | ||
357 | config INET_IPCOMP | 357 | config INET_IPCOMP |
358 | tristate "IP: IPComp transformation" | 358 | tristate "IP: IPComp transformation" |
359 | select XFRM | ||
360 | select INET_XFRM_TUNNEL | 359 | select INET_XFRM_TUNNEL |
361 | select CRYPTO | 360 | select XFRM_IPCOMP |
362 | select CRYPTO_DEFLATE | ||
363 | ---help--- | 361 | ---help--- |
364 | Support for IP Payload Compression Protocol (IPComp) (RFC3173), | 362 | Support for IP Payload Compression Protocol (IPComp) (RFC3173), |
365 | typically needed for IPsec. | 363 | typically needed for IPsec. |