]> git.karo-electronics.de Git - linux-beck.git/commitdiff
act_connmark: Add missing dependency on NF_CONNTRACK_MARK
authorThomas Graf <tgraf@suug.ch>
Tue, 20 Jan 2015 12:44:25 +0000 (13:44 +0100)
committerDavid S. Miller <davem@davemloft.net>
Sat, 24 Jan 2015 01:46:09 +0000 (17:46 -0800)
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>
net/sched/Kconfig

index 475e35e261ec7b35027faaef2ae004639a993e7d..7a57f66e654a1d1f1d8e3af3fcefc4be3d103dd1 100644 (file)
@@ -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