projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ar71xx: Buffalo WHR-HP-G300N kernel support
[openwrt.git]
/
target
/
linux
/
generic
/
patches-2.6.36
/
290-sched_act_connmark.patch
diff --git
a/target/linux/generic/patches-2.6.36/290-sched_act_connmark.patch
b/target/linux/generic/patches-2.6.36/290-sched_act_connmark.patch
index
286bdae
..
f571486
100644
(file)
--- a/
target/linux/generic/patches-2.6.36/290-sched_act_connmark.patch
+++ b/
target/linux/generic/patches-2.6.36/290-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
-@@ -549,6 +549,1
8
@@ config NET_ACT_SKBEDIT
+@@ -549,6 +549,1
9
@@ config NET_ACT_SKBEDIT
To compile this code as a module, choose M here: the
module will be called act_skbedit.
To compile this code as a module, choose M here: the
module will be called act_skbedit.
@@
-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
+
This page took
0.022756 seconds
and
4
git commands to generate.