Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph...

[~andy/linux] / net / netfilter / Kconfig

diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig
index e223f47b8bae1a457779fed1a4c1e2509b707328..8593a77cfea906ac0257405fb8aa9ae0e0bef597 100644 (file)
--- a/net/netfilter/Kconfig
+++ b/net/netfilter/Kconfig
@@ -506,6 +506,7 @@ config NETFILTER_XT_TARGET_TEE
        tristate '"TEE" - packet cloning to alternate destiantion'
        depends on NETFILTER_ADVANCED
        depends on (IPV6 || IPV6=n)
+       depends on !NF_CONNTRACK || NF_CONNTRACK
        ---help---
        This option adds a "TEE" target with which a packet can be cloned and
        this clone be rerouted to another nexthop.