Merge branch 'linus' of master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa

[sfrench/cifs-2.6.git] / net / ipv6 / netfilter / Kconfig

diff --git a/net/ipv6/netfilter/Kconfig b/net/ipv6/netfilter/Kconfig
index 4bc4e5b3379415130234b3668e19a94ccb448658..cd549aea84f068aebe9edfb75e5b99df6eb9da59 100644 (file)
--- a/net/ipv6/netfilter/Kconfig
+++ b/net/ipv6/netfilter/Kconfig
@@ -6,8 +6,8 @@ menu "IPv6: Netfilter Configuration (EXPERIMENTAL)"
        depends on INET && IPV6 && NETFILTER && EXPERIMENTAL
 
 config NF_CONNTRACK_IPV6
-       tristate "IPv6 support for new connection tracking (EXPERIMENTAL)"
-       depends on EXPERIMENTAL && NF_CONNTRACK
+       tristate "IPv6 connection tracking support (EXPERIMENTAL)"
+       depends on INET && IPV6 && EXPERIMENTAL && NF_CONNTRACK
        ---help---
          Connection tracking keeps a record of what packets have passed
          through your machine, in order to figure out how they are related
@@ -21,6 +21,7 @@ config NF_CONNTRACK_IPV6
 
 config IP6_NF_QUEUE
        tristate "IP6 Userspace queueing via NETLINK (OBSOLETE)"
+       depends on INET && IPV6 && NETFILTER && EXPERIMENTAL
        ---help---
 
          This option adds a queue handler to the kernel for IPv6
@@ -40,8 +41,8 @@ config IP6_NF_QUEUE
          To compile it as a module, choose M here.  If unsure, say N.
 
 config IP6_NF_IPTABLES
-       tristate "IP6 tables support (required for filtering/masq/NAT)"
-       depends on NETFILTER_XTABLES
+       tristate "IP6 tables support (required for filtering)"
+       depends on INET && IPV6 && EXPERIMENTAL && NETFILTER_XTABLES
        help
          ip6tables is a general, extensible packet identification framework.
          Currently only the packet filtering and packet mangling subsystem
@@ -113,6 +114,14 @@ config IP6_NF_MATCH_AH
 
          To compile it as a module, choose M here.  If unsure, say N.
 
+config IP6_NF_MATCH_MH
+       tristate "MH match support"
+       depends on IP6_NF_IPTABLES
+       help
+         This module allows one to match MH packets.
+
+         To compile it as a module, choose M here.  If unsure, say N.
+
 config IP6_NF_MATCH_EUI64
        tristate "EUI64 address check"
        depends on IP6_NF_IPTABLES