diff options
author | florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-07-05 12:40:50 +0000 |
---|---|---|
committer | florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-07-05 12:40:50 +0000 |
commit | bc9fd85f5730afcad873c5ddb85763c16e76fefd (patch) | |
tree | 4220e8594f124ec50d912e4fdec76500404223f9 /target/linux/generic/patches-2.6.32/280-sched_act_connmark.patch | |
parent | 458e5861cd622c98e90b904122e79ddd4c1e95b2 (diff) |
[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
Diffstat (limited to 'target/linux/generic/patches-2.6.32/280-sched_act_connmark.patch')
-rw-r--r-- | target/linux/generic/patches-2.6.32/280-sched_act_connmark.patch | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/target/linux/generic/patches-2.6.32/280-sched_act_connmark.patch b/target/linux/generic/patches-2.6.32/280-sched_act_connmark.patch index 734fd1cd14..1d1fc681a2 100644 --- a/target/linux/generic/patches-2.6.32/280-sched_act_connmark.patch +++ b/target/linux/generic/patches-2.6.32/280-sched_act_connmark.patch @@ -140,7 +140,7 @@ +module_exit(connmark_cleanup_module); --- a/net/sched/Kconfig +++ b/net/sched/Kconfig -@@ -546,6 +546,18 @@ config NET_ACT_SKBEDIT +@@ -546,6 +546,19 @@ config NET_ACT_SKBEDIT To compile this code as a module, choose M here: the module will be called skbedit. @@ -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 + |