sched_connmark depends on NF_CONNTRACK_MARK (#8976, #9423)

SVN-Revision: 27457
2011-07-05 12:40:50 +00:00
parent c52560302d
commit d24fc7ef56
6 changed files with 12 additions and 6 deletions
--- a/target/linux/generic/patches-2.6.37/621-sched_act_connmark.patch
+++ b/target/linux/generic/patches-2.6.37/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
 +