act_connmark: fix dependencies better
authorArnd Bergmann <arnd@arndb.de>
Wed, 28 Jan 2015 16:30:09 +0000 (17:30 +0100)
committerDavid S. Miller <davem@davemloft.net>
Thu, 29 Jan 2015 07:23:06 +0000 (23:23 -0800)
commit2dbce096ca3ac18711f72e517ed9674d53310b67
tree5464baacce0242ffc32c12eddaa78e85c373d31e
parent7cc05662682da4b0e0a4fdf3c3f190577803ae81
act_connmark: fix dependencies better

NET_ACT_CONNMARK fails to build if NF_CONNTRACK_MARK is disabled,
and d7924450e14ea4 ("act_connmark: Add missing dependency on
NF_CONNTRACK_MARK") fixed that case, but missed the cased where
NF_CONNTRACK is a loadable module.

This adds the second dependency to ensure that NET_ACT_CONNMARK
can only be built-in if NF_CONNTRACK is also part of the kernel
rather than a loadable module.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/sched/Kconfig