Pull bugzilla-7887 into release branch

[linux-2.6-omap-h63xx.git] / net / ipv6 / netfilter / Kconfig

diff --git a/net/ipv6/netfilter/Kconfig b/net/ipv6/netfilter/Kconfig
index fc3e5eb4bc3f62b8b7c251a639f5a33056fb89cd..da07e9a88ee928656bdd8da4d7b2644da00832d2 100644 (file)
--- a/net/ipv6/netfilter/Kconfig
+++ b/net/ipv6/netfilter/Kconfig
@@ -7,7 +7,7 @@ menu "IPv6: Netfilter Configuration (EXPERIMENTAL)"
 
 config NF_CONNTRACK_IPV6
        tristate "IPv6 connection tracking support (EXPERIMENTAL)"
-       depends on EXPERIMENTAL && NF_CONNTRACK
+       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
@@ -41,7 +42,8 @@ config IP6_NF_QUEUE
 
 config IP6_NF_IPTABLES
        tristate "IP6 tables support (required for filtering)"
-       depends on NETFILTER_XTABLES
+       depends on INET && IPV6 && EXPERIMENTAL
+       select NETFILTER_XTABLES
        help
          ip6tables is a general, extensible packet identification framework.
          Currently only the packet filtering and packet mangling subsystem
@@ -113,6 +115,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