---

yaml --- r: 144586 b: refs/heads/master c: acda074 h: refs/heads/master v: v3
git-mirror · May 1, 2009 · 722c4ab · 722c4ab
1 parent e35ccdc
commit 722c4ab
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: 689c96cca7ec3d2ba7fba00481810f99f1803c63
+refs/heads/master: acda074390270ca9e28f2a9729f7b835e2ad6da4
diff --git a/trunk/net/netfilter/Kconfig b/trunk/net/netfilter/Kconfig
@@ -837,6 +837,7 @@ config NETFILTER_XT_MATCH_SOCKET
 	depends on NETFILTER_TPROXY
 	depends on NETFILTER_XTABLES
 	depends on NETFILTER_ADVANCED
+	depends on !NF_CONNTRACK || NF_CONNTRACK
 	select NF_DEFRAG_IPV4
 	help
 	  This option adds a `socket' match, which can be used to match