diff options
| author | Thomas Graf <tgraf@suug.ch> | 2015-01-20 13:44:25 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-01-24 02:46:09 +0100 |
| commit | d7924450e14ea414568563ec01489f77452b00b4 (patch) | |
| tree | a6752474824a2835044dcbfade29aa8f7c85c481 /net/sched | |
| parent | Merge tag 'mac80211-next-for-davem-2015-01-19' of git://git.kernel.org/pub/sc... (diff) | |
| download | linux-d7924450e14ea414568563ec01489f77452b00b4.tar.xz linux-d7924450e14ea414568563ec01489f77452b00b4.zip | |
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>
Diffstat (limited to 'net/sched')
| -rw-r--r-- | net/sched/Kconfig | 1 |
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 |