projects
/
openwrt
/
svn-archive
/
archive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cns3xxx: sync kernel config
[openwrt/svn-archive/archive.git]
/
target
/
linux
/
generic
/
patches-2.6.39
/
621-sched_act_connmark.patch
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 c8c9b232a5314723616d5d2c25ebb42005425042..537ded13d727942531da37be8ac0f49a2b90806e 100644
(file)
--- 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
+module_exit(connmark_cleanup_module);
--- a/net/sched/Kconfig
+++ b/net/sched/Kconfig
-@@ -590,6 +590,1
8
@@ config NET_ACT_CSUM
+@@ -590,6 +590,1
9
@@ config NET_ACT_CSUM
To compile this code as a module, choose M here: the
module will be called 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
+ 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
+
+ ---help---
+ Say Y here to restore the connmark from a scheduler action
+