[NETFILTER]: Mark ctnetlink as EXPERIMENTAL

Should have been marked EXPERIMENTAL from the beginning, as the current
bunch of fixes show.

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/ipv4/netfilter/Kconfig b/net/ipv4/netfilter/Kconfig
index 0bc00528d888d1d26ba9727f250bc1d2ad0ebfe0..88a60650e6b8d795462c58e9f0a14159bbb96ee6 100644 (file)
--- a/net/ipv4/netfilter/Kconfig
+++ b/net/ipv4/netfilter/Kconfig
@@ -56,8 +56,8 @@ config IP_NF_CONNTRACK_MARK
          instead of the individual packets.
        
 config IP_NF_CONNTRACK_EVENTS
-       bool "Connection tracking events"
-       depends on IP_NF_CONNTRACK
+       bool "Connection tracking events (EXPERIMENTAL)"
+       depends on EXPERIMENTAL && IP_NF_CONNTRACK
        help
          If this option is enabled, the connection tracking code will
          provide a notifier chain that can be used by other kernel code
@@ -66,8 +66,8 @@ config IP_NF_CONNTRACK_EVENTS
          IF unsure, say `N'.
 
 config IP_NF_CONNTRACK_NETLINK
-       tristate 'Connection tracking netlink interface'
-       depends on IP_NF_CONNTRACK && NETFILTER_NETLINK
+       tristate 'Connection tracking netlink interface (EXPERIMENTAL)'
+       depends on EXPERIMENTAL && IP_NF_CONNTRACK && NETFILTER_NETLINK
        depends on IP_NF_CONNTRACK!=y || NETFILTER_NETLINK!=m
        help
          This option enables support for a netlink-based userspace interface

diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig
index a84f9221e5f02d4e5d41640f010d0472346dd85f..794c41d19b28bb58896d2a42da5a2ffefc6629cb 100644 (file)
--- a/net/netfilter/Kconfig
+++ b/net/netfilter/Kconfig
@@ -61,8 +61,8 @@ config NF_CONNTRACK_MARK
          instead of the individual packets.
 
 config NF_CONNTRACK_EVENTS
-       bool "Connection tracking events"
-       depends on NF_CONNTRACK
+       bool "Connection tracking events (EXPERIMENTAL)"
+       depends on EXPERIMENTAL && NF_CONNTRACK
        help
          If this option is enabled, the connection tracking code will
          provide a notifier chain that can be used by other kernel code