diff options
| author |   David S. Miller <davem@davemloft.net> | 2012-10-26 14:40:55 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-10-26 14:40:55 -0400 |
| commit | f019948dbb388eacbc0fb61db1d30e686224df77 (patch) | |
| tree | 77aac489eb5de3682c5ae67501627170509d3f6f /net/netfilter/ipvs/Kconfig | |
| parent | net: Update args to dummy sock_update_classid(). (diff) | |
| parent | ipvs: fix build errors related to config option combinations (diff) | |
| download | linux-dev-f019948dbb388eacbc0fb61db1d30e686224df77.tar.xz linux-dev-f019948dbb388eacbc0fb61db1d30e686224df77.zip | |
Merge branch 'master' of git://1984.lsi.us.es/nf-next
Pablo Neira Ayuso says:
====================
The following changeset contains updates for IPVS from Jesper Dangaard
Brouer that did not reach the previous merge window in time.
More specifically, updates to improve IPv6 support in IPVS. More
relevantly, some of the existing code performed wrong handling of the
extensions headers and better fragmentation handling.
Jesper promised more follow-up patches to refine this after this batch
hits net-next. Yet to come.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/netfilter/ipvs/Kconfig')
| -rw-r--r-- | net/netfilter/ipvs/Kconfig | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/net/netfilter/ipvs/Kconfig b/net/netfilter/ipvs/Kconfig index 8b2cffdfdd99..0c3b1670b0d1 100644 --- a/net/netfilter/ipvs/Kconfig +++ b/net/netfilter/ipvs/Kconfig @@ -28,12 +28,11 @@ if IP_VS config IP_VS_IPV6 bool "IPv6 support for IPVS" depends on IPV6 = y || IP_VS = IPV6 + select IP6_NF_IPTABLES ---help--- - Add IPv6 support to IPVS. This is incomplete and might be dangerous. + Add IPv6 support to IPVS. - See http://www.mindbasket.com/ipvs for more information. - - Say N if unsure. + Say Y if unsure. config IP_VS_DEBUG bool "IP virtual server debugging" |