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/ipv4/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/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. |