diff options
| author | Yasuyuki Kozakai <yasuyuki.kozakai@toshiba.co.jp> | 2006-02-15 18:21:31 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2006-02-15 18:21:31 -0500 |
| commit | deac0ccdb4da16b68539d75edecf26162de05150 (patch) | |
| tree | ec79f4d4fa6f26b7a00fb5346c4d48f97867e246 /net | |
| parent | 9c92d3486434e7310cb288587953e2dae4a79701 (diff) | |
[NETFILTER]: x_tables: fix dependencies of conntrack related modules
NF_CONNTRACK_MARK is bool and depends on NF_CONNTRACK which is
tristate. If a variable depends on NF_CONNTRACK_MARK and doesn't take
care about NF_CONNTRACK, it can be y even if NF_CONNTRACK isn't y.
NF_CT_ACCT have same issue, too.
Signed-off-by: Yasuyuki Kozakai <yasuyuki.kozakai@toshiba.co.jp>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/netfilter/Kconfig | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig index 0e550127fa7e..a8e5544da93e 100644 --- a/net/netfilter/Kconfig +++ b/net/netfilter/Kconfig | |||
| @@ -126,7 +126,7 @@ config NETFILTER_XT_TARGET_CONNMARK | |||
| 126 | tristate '"CONNMARK" target support' | 126 | tristate '"CONNMARK" target support' |
| 127 | depends on NETFILTER_XTABLES | 127 | depends on NETFILTER_XTABLES |
| 128 | depends on IP_NF_MANGLE || IP6_NF_MANGLE | 128 | depends on IP_NF_MANGLE || IP6_NF_MANGLE |
| 129 | depends on (IP_NF_CONNTRACK && IP_NF_CONNTRACK_MARK) || (NF_CONNTRACK_MARK && NF_CONNTRACK_IPV4) | 129 | depends on (IP_NF_CONNTRACK && IP_NF_CONNTRACK_MARK) || (NF_CONNTRACK_MARK && NF_CONNTRACK) |
| 130 | help | 130 | help |
| 131 | This option adds a `CONNMARK' target, which allows one to manipulate | 131 | This option adds a `CONNMARK' target, which allows one to manipulate |
| 132 | the connection mark value. Similar to the MARK target, but | 132 | the connection mark value. Similar to the MARK target, but |
| @@ -187,7 +187,7 @@ config NETFILTER_XT_MATCH_COMMENT | |||
| 187 | config NETFILTER_XT_MATCH_CONNBYTES | 187 | config NETFILTER_XT_MATCH_CONNBYTES |
| 188 | tristate '"connbytes" per-connection counter match support' | 188 | tristate '"connbytes" per-connection counter match support' |
| 189 | depends on NETFILTER_XTABLES | 189 | depends on NETFILTER_XTABLES |
| 190 | depends on (IP_NF_CONNTRACK && IP_NF_CT_ACCT) || NF_CT_ACCT | 190 | depends on (IP_NF_CONNTRACK && IP_NF_CT_ACCT) || (NF_CT_ACCT && NF_CONNTRACK) |
| 191 | help | 191 | help |
| 192 | This option adds a `connbytes' match, which allows you to match the | 192 | This option adds a `connbytes' match, which allows you to match the |
| 193 | number of bytes and/or packets for each direction within a connection. | 193 | number of bytes and/or packets for each direction within a connection. |
| @@ -198,7 +198,7 @@ config NETFILTER_XT_MATCH_CONNBYTES | |||
| 198 | config NETFILTER_XT_MATCH_CONNMARK | 198 | config NETFILTER_XT_MATCH_CONNMARK |
| 199 | tristate '"connmark" connection mark match support' | 199 | tristate '"connmark" connection mark match support' |
| 200 | depends on NETFILTER_XTABLES | 200 | depends on NETFILTER_XTABLES |
| 201 | depends on (IP_NF_CONNTRACK && IP_NF_CONNTRACK_MARK) || NF_CONNTRACK_MARK | 201 | depends on (IP_NF_CONNTRACK && IP_NF_CONNTRACK_MARK) || (NF_CONNTRACK_MARK && NF_CONNTRACK) |
| 202 | help | 202 | help |
| 203 | This option adds a `connmark' match, which allows you to match the | 203 | This option adds a `connmark' match, which allows you to match the |
| 204 | connection mark value previously set for the session by `CONNMARK'. | 204 | connection mark value previously set for the session by `CONNMARK'. |