KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

sched_connmark depends on NF_CONNTRACK_MARK (#8976, #9423)

Browse source 
SVN-Revision: 27457
This commit is contained in:
Florian Fainelli 2011-07-05 12:40:50 +00:00
parent c52560302d
commit d24fc7ef56
6 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
target/linux/generic/patches-2.6.32/280-sched_act_connmark.patch
View file

@ -140,7 +140,7 @@
+module_exit(connmark_cleanup_module); +module_exit(connmark_cleanup_module);
--- a/net/sched/Kconfig --- a/net/sched/Kconfig
+++ b/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 To compile this code as a module, choose M here: the
module will be called skbedit. module will be called skbedit.
@ -148,6 +148,7 @@
+ tristate "Connection Tracking Marking" + tristate "Connection Tracking Marking"
+ depends on NET_CLS_ACT + depends on NET_CLS_ACT
+ depends on NF_CONNTRACK + depends on NF_CONNTRACK
+ depends on NF_CONNTRACK_MARK
+ ---help--- + ---help---
+ Say Y here to restore the connmark from a scheduler action + Say Y here to restore the connmark from a scheduler action
+ +

3
target/linux/generic/patches-2.6.36/290-sched_act_connmark.patch
View file

@ -140,7 +140,7 @@
+module_exit(connmark_cleanup_module); +module_exit(connmark_cleanup_module);
--- a/net/sched/Kconfig --- a/net/sched/Kconfig
+++ b/net/sched/Kconfig +++ b/net/sched/Kconfig
@@ -549,6 +549,18 @@ config NET_ACT_SKBEDIT @@ -549,6 +549,19 @@ config NET_ACT_SKBEDIT
To compile this code as a module, choose M here: the To compile this code as a module, choose M here: the
module will be called act_skbedit. module will be called act_skbedit.
@ -148,6 +148,7 @@
+ tristate "Connection Tracking Marking" + tristate "Connection Tracking Marking"
+ depends on NET_CLS_ACT + depends on NET_CLS_ACT
+ depends on NF_CONNTRACK + depends on NF_CONNTRACK
+ depends on NF_CONNTRACK_MARK
+ ---help--- + ---help---
+ Say Y here to restore the connmark from a scheduler action + Say Y here to restore the connmark from a scheduler action
+ +

3
target/linux/generic/patches-2.6.37/621-sched_act_connmark.patch
View file

@ -140,7 +140,7 @@
+module_exit(connmark_cleanup_module); +module_exit(connmark_cleanup_module);
--- a/net/sched/Kconfig --- a/net/sched/Kconfig
+++ b/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 To compile this code as a module, choose M here: the
module will be called act_csum. module will be called act_csum.
@ -148,6 +148,7 @@
+ tristate "Connection Tracking Marking" + tristate "Connection Tracking Marking"
+ depends on NET_CLS_ACT + depends on NET_CLS_ACT
+ depends on NF_CONNTRACK + depends on NF_CONNTRACK
+ depends on NF_CONNTRACK_MARK
+ ---help--- + ---help---
+ Say Y here to restore the connmark from a scheduler action + Say Y here to restore the connmark from a scheduler action
+ +

3
target/linux/generic/patches-2.6.38/621-sched_act_connmark.patch
View file

@ -140,7 +140,7 @@
+module_exit(connmark_cleanup_module); +module_exit(connmark_cleanup_module);
--- a/net/sched/Kconfig --- a/net/sched/Kconfig
+++ b/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 To compile this code as a module, choose M here: the
module will be called act_csum. module will be called act_csum.
@ -148,6 +148,7 @@
+ tristate "Connection Tracking Marking" + tristate "Connection Tracking Marking"
+ depends on NET_CLS_ACT + depends on NET_CLS_ACT
+ depends on NF_CONNTRACK + depends on NF_CONNTRACK
+ depends on NF_CONNTRACK_MARK
+ ---help--- + ---help---
+ Say Y here to restore the connmark from a scheduler action + Say Y here to restore the connmark from a scheduler action
+ +

3
target/linux/generic/patches-2.6.39/621-sched_act_connmark.patch
View file

@ -140,7 +140,7 @@
+module_exit(connmark_cleanup_module); +module_exit(connmark_cleanup_module);
--- a/net/sched/Kconfig --- a/net/sched/Kconfig
+++ b/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 To compile this code as a module, choose M here: the
module will be called act_csum. module will be called act_csum.
@ -148,6 +148,7 @@
+ tristate "Connection Tracking Marking" + tristate "Connection Tracking Marking"
+ depends on NET_CLS_ACT + depends on NET_CLS_ACT
+ depends on NF_CONNTRACK + depends on NF_CONNTRACK
+ depends on NF_CONNTRACK_MARK
+ ---help--- + ---help---
+ Say Y here to restore the connmark from a scheduler action + Say Y here to restore the connmark from a scheduler action
+ +

3
target/linux/generic/patches-3.0/621-sched_act_connmark.patch
View file

@ -140,7 +140,7 @@
+module_exit(connmark_cleanup_module); +module_exit(connmark_cleanup_module);
--- a/net/sched/Kconfig --- a/net/sched/Kconfig
+++ b/net/sched/Kconfig +++ b/net/sched/Kconfig
@@ -602,6 +602,18 @@ config NET_ACT_CSUM @@ -602,6 +602,19 @@ config NET_ACT_CSUM
To compile this code as a module, choose M here: the To compile this code as a module, choose M here: the
module will be called act_csum. module will be called act_csum.
@ -148,6 +148,7 @@
+ tristate "Connection Tracking Marking" + tristate "Connection Tracking Marking"
+ depends on NET_CLS_ACT + depends on NET_CLS_ACT
+ depends on NF_CONNTRACK + depends on NF_CONNTRACK
+ depends on NF_CONNTRACK_MARK
+ ---help--- + ---help---
+ Say Y here to restore the connmark from a scheduler action + Say Y here to restore the connmark from a scheduler action
+ +