diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-25 20:40:16 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-25 20:40:16 -0400 |
commit | 1ff8419871ea757ae0298aa296bcff9b2ca48561 (patch) | |
tree | ff2194bc75f06107e16220ce303ef546f9a4c769 /net/ipv6/Kconfig | |
parent | 8d25b36b77fe32c296ece83e94ca6ae4d17f3e25 (diff) | |
parent | 7d7e5a60c62e88cb8782760bb6c4d3bd1577a6c6 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
ipsec: ipcomp - Decompress into frags if necessary
ipsec: ipcomp - Merge IPComp implementations
pkt_sched: Fix locking in shutdown_scheduler_queue()
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 | |||
96 | 96 | ||
97 | config INET6_IPCOMP | 97 | config INET6_IPCOMP |
98 | tristate "IPv6: IPComp transformation" | 98 | tristate "IPv6: IPComp transformation" |
99 | select XFRM | ||
100 | select INET6_XFRM_TUNNEL | 99 | select INET6_XFRM_TUNNEL |
101 | select CRYPTO | 100 | select XFRM_IPCOMP |
102 | select CRYPTO_DEFLATE | ||
103 | ---help--- | 101 | ---help--- |
104 | Support for IP Payload Compression Protocol (IPComp) (RFC3173), | 102 | Support for IP Payload Compression Protocol (IPComp) (RFC3173), |
105 | typically needed for IPsec. | 103 | typically needed for IPsec. |