summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Graf <tgraf@suug.ch>2015-01-20 13:44:25 +0100
committerDavid S. Miller <davem@davemloft.net>2015-01-23 17:46:09 -0800
commitd7924450e14ea414568563ec01489f77452b00b4 (patch)
treea6752474824a2835044dcbfade29aa8f7c85c481
parent0c49087462e8587c12ecfeaf1dd46fdc0ddc4532 (diff)
act_connmark: Add missing dependency on NF_CONNTRACK_MARK
Depending on NETFILTER is not sufficient to ensure the presence of the 'mark' field in nf_conn, also needs to depend on NF_CONNTRACK_MARK. Fixes: 22a5dc ("net: sched: Introduce connmark action") Cc: Felix Fietkau <nbd@openwrt.org> Cc: Jamal Hadi Salim <jhs@mojatatu.com> Signed-off-by: Thomas Graf <tgraf@suug.ch> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/sched/Kconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/sched/Kconfig b/net/sched/Kconfig
index 475e35e261ec..7a57f66e654a 100644
--- a/net/sched/Kconfig
+++ b/net/sched/Kconfig
@@ -713,6 +713,7 @@ config NET_ACT_BPF
config NET_ACT_CONNMARK
tristate "Netfilter Connection Mark Retriever"
depends on NET_CLS_ACT && NETFILTER && IP_NF_IPTABLES
+ depends on NF_CONNTRACK_MARK
---help---
Say Y here to allow retrieving of conn mark