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

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

[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: default avatarYasuyuki Kozakai <yasuyuki.kozakai@toshiba.co.jp>
Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9c92d348

net/netfilter/Kconfig

+3 −3
Original line number Diff line number Diff line
@@ -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'.