diff mbox

[net-next] act_connmark: Add missing dependency on NF_CONNTRACK_MARK

Message ID eb5e12e8fec691cb08e663f2f8ed183ac92e5a1f.1421757793.git.tgraf@suug.ch
State Accepted, archived
Delegated to: David Miller
Headers show

Commit Message

Thomas Graf Jan. 20, 2015, 12:44 p.m. UTC
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>
---
 net/sched/Kconfig | 1 +
 1 file changed, 1 insertion(+)

Comments

David Miller Jan. 24, 2015, 1:46 a.m. UTC | #1
From: Thomas Graf <tgraf@suug.ch>
Date: Tue, 20 Jan 2015 13:44:25 +0100

> 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>

Applied, thanks Thomas.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/net/sched/Kconfig b/net/sched/Kconfig
index 475e35e..7a57f66 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