diff options
| author | Florian Fainelli <florian@openwrt.org> | 2011-07-05 12:40:50 +0000 |
|---|---|---|
| committer | Florian Fainelli <florian@openwrt.org> | 2011-07-05 12:40:50 +0000 |
| commit | d24fc7ef562a00e10414aac8576a149bfdc791a5 (patch) | |
| tree | c577e15633b4bfac5436eb00dc1466751c7cd0b8 /target/linux/generic/patches-2.6.39 | |
| parent | c52560302df64983422d3dd8ba7e495db9a0d792 (diff) | |
| download | upstream-d24fc7ef562a00e10414aac8576a149bfdc791a5.tar.gz upstream-d24fc7ef562a00e10414aac8576a149bfdc791a5.tar.bz2 upstream-d24fc7ef562a00e10414aac8576a149bfdc791a5.zip | |
sched_connmark depends on NF_CONNTRACK_MARK (#8976, #9423)
SVN-Revision: 27457
Diffstat (limited to 'target/linux/generic/patches-2.6.39')
| -rw-r--r-- | target/linux/generic/patches-2.6.39/621-sched_act_connmark.patch | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/target/linux/generic/patches-2.6.39/621-sched_act_connmark.patch b/target/linux/generic/patches-2.6.39/621-sched_act_connmark.patch index c8c9b232a5..537ded13d7 100644 --- a/target/linux/generic/patches-2.6.39/621-sched_act_connmark.patch +++ b/target/linux/generic/patches-2.6.39/621-sched_act_connmark.patch @@ -140,7 +140,7 @@ +module_exit(connmark_cleanup_module); --- a/net/sched/Kconfig +++ b/net/sched/Kconfig -@@ -590,6 +590,18 @@ config NET_ACT_CSUM +@@ -590,6 +590,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 + |