From bc9fd85f5730afcad873c5ddb85763c16e76fefd Mon Sep 17 00:00:00 2001 From: florian Date: Tue, 5 Jul 2011 12:40:50 +0000 Subject: [kernel] sched_connmark depends on NF_CONNTRACK_MARK (#8976, #9423) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27457 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/generic/patches-2.6.38/621-sched_act_connmark.patch | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'target/linux/generic/patches-2.6.38') diff --git a/target/linux/generic/patches-2.6.38/621-sched_act_connmark.patch b/target/linux/generic/patches-2.6.38/621-sched_act_connmark.patch index 33429cb43..7df4b7260 100644 --- a/target/linux/generic/patches-2.6.38/621-sched_act_connmark.patch +++ b/target/linux/generic/patches-2.6.38/621-sched_act_connmark.patch @@ -140,7 +140,7 @@ +module_exit(connmark_cleanup_module); --- a/net/sched/Kconfig +++ b/net/sched/Kconfig -@@ -559,6 +559,18 @@ config NET_ACT_CSUM +@@ -559,6 +559,19 @@ config NET_ACT_CSUM To compile this code as a module, choose M here: the module will be called act_csum. @@ -148,6 +148,7 @@ + tristate "Connection Tracking Marking" + depends on NET_CLS_ACT + depends on NF_CONNTRACK ++ depends on NF_CONNTRACK_MARK + ---help--- + Say Y here to restore the connmark from a scheduler action + -- cgit v1.2.3