---

yaml --- r: 195097 b: refs/heads/master c: 83827f6 h: refs/heads/master i: 195095: 8279bca v: v3
git-mirror · May 14, 2010 · ddf45c7 · ddf45c7
1 parent 261eb73
commit ddf45c7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6df900e96c70208a931968da99f24cc982de116e
+refs/heads/master: 83827f6a891e20de7468b1181f2ae8a3cc72587b
diff --git a/trunk/net/netfilter/Kconfig b/trunk/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.