From 090d2acc2429d87dad88707f267d83e4319f40d6 Mon Sep 17 00:00:00 2001
From: Yasuyuki Kozakai <yasuyuki.kozakai@toshiba.co.jp>
Date: Wed, 15 Feb 2006 15:21:31 -0800
Subject: [PATCH] --- yaml --- r: 20351 b: refs/heads/master c:
 deac0ccdb4da16b68539d75edecf26162de05150 h: refs/heads/master i:   20349:
 3d5da406787e769662f2cd1d9f801fdf29d66004   20347:
 0e1616ffbf176b4113dc003f9e991b640e499d45   20343:
 ca16d49ee3067838ca2a16d3a5a6672a30d57ae5   20335:
 4b17c9d80e29b3a17edbbebe4072b0d430feb087   20319:
 8571eec566314993b92c80ffb743a8f0af866cfd   20287:
 db79bcdf6af1a21517d42ad139ff72fa8654951c   20223:
 69c304238afb1bac00819a7a473bbf52cf7c20c7 v: v3

---
 [refs]                      | 2 +-
 trunk/net/netfilter/Kconfig | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index aebed945e751..931a8c3284e6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9c92d3486434e7310cb288587953e2dae4a79701
+refs/heads/master: deac0ccdb4da16b68539d75edecf26162de05150
diff --git a/trunk/net/netfilter/Kconfig b/trunk/net/netfilter/Kconfig
index 0e550127fa7e..a8e5544da93e 100644
--- a/trunk/net/netfilter/Kconfig
+++ b/trunk/net/netfilter/Kconfig
@@ -126,7 +126,7 @@ config NETFILTER_XT_TARGET_CONNMARK
 	tristate  '"CONNMARK" target support'
 	depends on NETFILTER_XTABLES
 	depends on IP_NF_MANGLE || IP6_NF_MANGLE
-	depends on (IP_NF_CONNTRACK && IP_NF_CONNTRACK_MARK) || (NF_CONNTRACK_MARK && NF_CONNTRACK_IPV4)
+	depends on (IP_NF_CONNTRACK && IP_NF_CONNTRACK_MARK) || (NF_CONNTRACK_MARK && NF_CONNTRACK)
 	help
 	  This option adds a `CONNMARK' target, which allows one to manipulate
 	  the connection mark value.  Similar to the MARK target, but
@@ -187,7 +187,7 @@ config NETFILTER_XT_MATCH_COMMENT
 config NETFILTER_XT_MATCH_CONNBYTES
 	tristate  '"connbytes" per-connection counter match support'
 	depends on NETFILTER_XTABLES
-	depends on (IP_NF_CONNTRACK && IP_NF_CT_ACCT) || NF_CT_ACCT
+	depends on (IP_NF_CONNTRACK && IP_NF_CT_ACCT) || (NF_CT_ACCT && NF_CONNTRACK)
 	help
 	  This option adds a `connbytes' match, which allows you to match the
 	  number of bytes and/or packets for each direction within a connection.
@@ -198,7 +198,7 @@ config NETFILTER_XT_MATCH_CONNBYTES
 config NETFILTER_XT_MATCH_CONNMARK
 	tristate  '"connmark" connection mark match support'
 	depends on NETFILTER_XTABLES
-	depends on (IP_NF_CONNTRACK && IP_NF_CONNTRACK_MARK) || NF_CONNTRACK_MARK
+	depends on (IP_NF_CONNTRACK && IP_NF_CONNTRACK_MARK) || (NF_CONNTRACK_MARK && NF_CONNTRACK)
 	help
 	  This option adds a `connmark' match, which allows you to match the
 	  connection mark value previously set for the session by `CONNMARK'.