diff options
| author |   Herbert Xu <herbert@gondor.apana.org.au> | 2008-07-25 02:54:40 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2008-07-25 02:54:40 -0700 |
| commit | 6fccab671f2f0a24b799f29a4ec878f62d34656c (patch) | |
| tree | e90a1ac0770f8fe59bd7c8768663052a7756b950 /net/ipv6/Kconfig | |
| parent | pkt_sched: Fix locking in shutdown_scheduler_queue() (diff) | |
| download | linux-dev-6fccab671f2f0a24b799f29a4ec878f62d34656c.tar.xz linux-dev-6fccab671f2f0a24b799f29a4ec878f62d34656c.zip | |
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/ipv6/Kconfig')
| -rw-r--r-- | net/ipv6/Kconfig | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/net/ipv6/Kconfig b/net/ipv6/Kconfig index 42814a2ec9d7..ec992159b5f8 100644 --- a/net/ipv6/Kconfig +++ b/net/ipv6/Kconfig @@ -96,10 +96,8 @@ config INET6_ESP config INET6_IPCOMP tristate "IPv6: IPComp transformation" - select XFRM select INET6_XFRM_TUNNEL - select CRYPTO - select CRYPTO_DEFLATE + select XFRM_IPCOMP ---help--- Support for IP Payload Compression Protocol (IPComp) (RFC3173), typically needed for IPsec. |