[ATM] drivers/atm/iphase.c: compilation warning fix

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

diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig
index 96dbe9f56bcdc12ab58a3bb7dd1f710324377c74..daf5b881064da7d1ba507f8f532ef6f1c5bc5af3 100644 (file)
--- a/net/netfilter/Kconfig
+++ b/net/netfilter/Kconfig
@@ -76,8 +76,8 @@ config NF_CONNTRACK_SECMARK
          If unsure, say 'N'.
 
 config NF_CONNTRACK_EVENTS
-       bool "Connection tracking events (EXPERIMENTAL)"
-       depends on EXPERIMENTAL && NF_CONNTRACK
+       bool "Connection tracking events"
+       depends on NF_CONNTRACK
        depends on NETFILTER_ADVANCED
        help
          If this option is enabled, the connection tracking code will
@@ -102,8 +102,8 @@ config NF_CT_PROTO_SCTP
          <file:Documentation/kbuild/modules.txt>.  If unsure, say `N'.
 
 config NF_CT_PROTO_UDPLITE
-       tristate 'UDP-Lite protocol connection tracking support (EXPERIMENTAL)'
-       depends on EXPERIMENTAL && NF_CONNTRACK
+       tristate 'UDP-Lite protocol connection tracking support'
+       depends on NF_CONNTRACK
        depends on NETFILTER_ADVANCED
        help
          With this option enabled, the layer 3 independent connection
@@ -144,8 +144,8 @@ config NF_CONNTRACK_FTP
          To compile it as a module, choose M here.  If unsure, say N.
 
 config NF_CONNTRACK_H323
-       tristate "H.323 protocol support (EXPERIMENTAL)"
-       depends on EXPERIMENTAL && NF_CONNTRACK && (IPV6 || IPV6=n)
+       tristate "H.323 protocol support"
+       depends on NF_CONNTRACK && (IPV6 || IPV6=n)
        depends on NETFILTER_ADVANCED
        help
          H.323 is a VoIP signalling protocol from ITU-T. As one of the most
@@ -180,8 +180,8 @@ config NF_CONNTRACK_IRC
          To compile it as a module, choose M here.  If unsure, say N.
 
 config NF_CONNTRACK_NETBIOS_NS
-       tristate "NetBIOS name service protocol support (EXPERIMENTAL)"
-       depends on EXPERIMENTAL && NF_CONNTRACK
+       tristate "NetBIOS name service protocol support"
+       depends on NF_CONNTRACK
        depends on NETFILTER_ADVANCED
        help
          NetBIOS name service requests are sent as broadcast messages from an
@@ -234,8 +234,8 @@ config NF_CONNTRACK_SANE
          To compile it as a module, choose M here.  If unsure, say N.
 
 config NF_CONNTRACK_SIP
-       tristate "SIP protocol support (EXPERIMENTAL)"
-       depends on EXPERIMENTAL && NF_CONNTRACK
+       tristate "SIP protocol support"
+       depends on NF_CONNTRACK
        default m if NETFILTER_ADVANCED=n
        help
          SIP is an application-layer control protocol that can establish,
@@ -259,8 +259,8 @@ config NF_CONNTRACK_TFTP
          To compile it as a module, choose M here.  If unsure, say N.
 
 config NF_CT_NETLINK
-       tristate 'Connection tracking netlink interface (EXPERIMENTAL)'
-       depends on EXPERIMENTAL && NF_CONNTRACK
+       tristate 'Connection tracking netlink interface'
+       depends on NF_CONNTRACK
        select NETFILTER_NETLINK
        depends on NF_NAT=n || NF_NAT
        default m if NETFILTER_ADVANCED=n
@@ -378,6 +378,7 @@ config NETFILTER_XT_TARGET_NOTRACK
 config NETFILTER_XT_TARGET_RATEEST
        tristate '"RATEEST" target support'
        depends on NETFILTER_XTABLES
+       depends on NETFILTER_ADVANCED
        help
          This option adds a `RATEEST' target, which allows to measure
          rates similar to TC estimators. The `rateest' match can be
@@ -566,6 +567,17 @@ config NETFILTER_XT_MATCH_HELPER
 
          To compile it as a module, choose M here.  If unsure, say Y.
 
+config NETFILTER_XT_MATCH_IPRANGE
+       tristate '"iprange" address range match support'
+       depends on NETFILTER_XTABLES
+       depends on NETFILTER_ADVANCED
+       ---help---
+       This option adds a "iprange" match, which allows you to match based on
+       an IP address range. (Normal iptables only matches on single addresses
+       with an optional mask.)
+
+       If unsure, say M.
+
 config NETFILTER_XT_MATCH_LENGTH
        tristate '"length" match support'
        depends on NETFILTER_XTABLES
@@ -676,6 +688,7 @@ config NETFILTER_XT_MATCH_QUOTA
 config NETFILTER_XT_MATCH_RATEEST
        tristate '"rateest" match support'
        depends on NETFILTER_XTABLES
+       depends on NETFILTER_ADVANCED
        select NETFILTER_XT_TARGET_RATEEST
        help
          This option adds a `rateest' match, which allows to match on the