2 files changed, 6 insertions, 6 deletions
diff --git a/net/ipv4/netfilter/Kconfig b/net/ipv4/netfilter/Kconfig
index 0bc00528d888..88a60650e6b8 100644
--- 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"
+        bool "Connection tracking events (EXPERIMENTAL)"
-        depends on IP_NF_CONNTRACK
+        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'
+        tristate 'Connection tracking netlink interface (EXPERIMENTAL)'
-        depends on IP_NF_CONNTRACK && NETFILTER_NETLINK
+        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 a84f9221e5f0..794c41d19b28 100644
--- 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"
+        bool "Connection tracking events (EXPERIMENTAL)"
-        depends on NF_CONNTRACK
+        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

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


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