ipv6: Fix duplicate initialization of rawv6_prot.destroy

[linux-2.6] / net / ipv6 / netfilter / Kconfig

diff --git a/net/ipv6/netfilter/Kconfig b/net/ipv6/netfilter/Kconfig
index a6b4a9a1053296a074f715422a2910ae8b249de5..6cae5475737e530c94024c9b3a70f820b020f64a 100644 (file)
--- a/net/ipv6/netfilter/Kconfig
+++ b/net/ipv6/netfilter/Kconfig
@@ -2,12 +2,12 @@
 # IP netfilter configuration
 #
 
-menu "IPv6: Netfilter Configuration (EXPERIMENTAL)"
-       depends on INET && IPV6 && NETFILTER && EXPERIMENTAL
+menu "IPv6: Netfilter Configuration"
+       depends on INET && IPV6 && NETFILTER
 
 config NF_CONNTRACK_IPV6
-       tristate "IPv6 connection tracking support (EXPERIMENTAL)"
-       depends on INET && IPV6 && EXPERIMENTAL && NF_CONNTRACK
+       tristate "IPv6 connection tracking support"
+       depends on INET && IPV6 && NF_CONNTRACK
        default m if NETFILTER_ADVANCED=n
        ---help---
          Connection tracking keeps a record of what packets have passed
@@ -22,7 +22,7 @@ config NF_CONNTRACK_IPV6
 
 config IP6_NF_QUEUE
        tristate "IP6 Userspace queueing via NETLINK (OBSOLETE)"
-       depends on INET && IPV6 && NETFILTER && EXPERIMENTAL
+       depends on INET && IPV6 && NETFILTER
        depends on NETFILTER_ADVANCED
        ---help---
 
@@ -44,7 +44,7 @@ config IP6_NF_QUEUE
 
 config IP6_NF_IPTABLES
        tristate "IP6 tables support (required for filtering)"
-       depends on INET && IPV6 && EXPERIMENTAL
+       depends on INET && IPV6
        select NETFILTER_XTABLES
        default m if NETFILTER_ADVANCED=n
        help
@@ -99,7 +99,7 @@ config IP6_NF_MATCH_HL
 config IP6_NF_MATCH_IPV6HEADER
        tristate '"ipv6header" IPv6 Extension Headers Match'
        depends on IP6_NF_IPTABLES
-       depends on NETFILTER_ADVANCED
+       default m if NETFILTER_ADVANCED=n
        help
          This module allows one to match packets based upon
          the ipv6 extension headers.