Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2b8f2ff6 authored by Yasuyuki Kozakai's avatar Yasuyuki Kozakai Committed by David S. Miller
Browse files

[NETFILTER]: fixed dependencies between modules related with ip_conntrack 



- IP_NF_CONNTRACK_MARK is bool and depends on only IP_NF_CONNTRACK
  which is tristate. If a variable depends on IP_NF_CONNTRACK_MARK and
  doesn't care about IP_NF_CONNTRACK, it can be y. This must be avoided.
- IP_NF_CT_ACCT has same problem.
- IP_NF_TARGET_CLUSTERIP also depends on IP_NF_MANGLE.

Signed-off-by: default avatarYasuyuki Kozakai <yasuyuki.kozakai@toshiba.co.jp>
Signed-off-by: default avatarHarald Welte <laforge@netfilter.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c9e53cbe

net/ipv4/netfilter/Kconfig

+5 −5
Original line number Original line Diff line number Diff line
@@ -440,7 +440,7 @@ config IP_NF_MATCH_COMMENT 
config IP_NF_MATCH_CONNMARK

config IP_NF_MATCH_CONNMARK

	tristate  'Connection mark match support'

	tristate  'Connection mark match support'

	depends on IP_NF_IPTABLES

	depends on IP_NF_IPTABLES

	depends on IP_NF_CONNTRACK_MARK || (NF_CONNTRACK_MARK && NF_CONNTRACK_IPV4)

	depends on (IP_NF_CONNTRACK && IP_NF_CONNTRACK_MARK) || (NF_CONNTRACK_MARK && NF_CONNTRACK_IPV4)

	help

	help

	  This option adds a `connmark' match, which allows you to match the

	  This option adds a `connmark' match, which allows you to match the

	  connection mark value previously set for the session by `CONNMARK'. 

	  connection mark value previously set for the session by `CONNMARK'.
@@ -452,7 +452,7 @@ config IP_NF_MATCH_CONNMARK 
config IP_NF_MATCH_CONNBYTES

config IP_NF_MATCH_CONNBYTES

	tristate  'Connection byte/packet counter match support'

	tristate  'Connection byte/packet counter match support'

	depends on IP_NF_IPTABLES

	depends on IP_NF_IPTABLES

	depends on IP_NF_CT_ACCT || (NF_CT_ACCT && NF_CONNTRACK_IPV4)

	depends on (IP_NF_CONNTRACK && IP_NF_CT_ACCT) || (NF_CT_ACCT && NF_CONNTRACK_IPV4)

	help

	help

	  This option adds a `connbytes' match, which allows you to match the

	  This option adds a `connbytes' match, which allows you to match the

	  number of bytes and/or packets for each direction within a connection.

	  number of bytes and/or packets for each direction within a connection.
@@ -767,7 +767,7 @@ config IP_NF_TARGET_TTL 
config IP_NF_TARGET_CONNMARK

config IP_NF_TARGET_CONNMARK

	tristate  'CONNMARK target support'

	tristate  'CONNMARK target support'

	depends on IP_NF_MANGLE

	depends on IP_NF_MANGLE

	depends on IP_NF_CONNTRACK_MARK || (NF_CONNTRACK_MARK && NF_CONNTRACK_IPV4)

	depends on (IP_NF_CONNTRACK && IP_NF_CONNTRACK_MARK) || (NF_CONNTRACK_MARK && NF_CONNTRACK_IPV4)

	help

	help

	  This option adds a `CONNMARK' target, which allows one to manipulate

	  This option adds a `CONNMARK' target, which allows one to manipulate

	  the connection mark value.  Similar to the MARK target, but

	  the connection mark value.  Similar to the MARK target, but
@@ -779,8 +779,8 @@ config IP_NF_TARGET_CONNMARK 




config IP_NF_TARGET_CLUSTERIP

config IP_NF_TARGET_CLUSTERIP

	tristate "CLUSTERIP target support (EXPERIMENTAL)"

	tristate "CLUSTERIP target support (EXPERIMENTAL)"

	depends on IP_NF_IPTABLES && EXPERIMENTAL

	depends on IP_NF_MANGLE && EXPERIMENTAL

	depends on IP_NF_CONNTRACK_MARK || (NF_CONNTRACK_MARK && NF_CONNTRACK_IPV4)

	depends on (IP_NF_CONNTRACK && IP_NF_CONNTRACK_MARK) || (NF_CONNTRACK_MARK && NF_CONNTRACK_IPV4)

	help

	help

	  The CLUSTERIP target allows you to build load-balancing clusters of

	  The CLUSTERIP target allows you to build load-balancing clusters of

	  network servers without having a dedicated load-balancing

	  network servers without having a dedicated load-balancing