From: Thomas Graf <tgraf@suug.ch>
Date: Tue, 20 Jan 2015 12:44:25 +0000 (+0100)
Subject: act_connmark: Add missing dependency on NF_CONNTRACK_MARK
X-Git-Tag: fixes-v4.0-rc1~150^2~162
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d7924450e14ea414568563ec01489f77452b00b4;p=pandora-kernel.git

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

Reading git-diff-tree failed