summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--target/linux/generic/patches-2.6.32/280-sched_act_connmark.patch3
-rw-r--r--target/linux/generic/patches-2.6.36/290-sched_act_connmark.patch3
-rw-r--r--target/linux/generic/patches-2.6.37/621-sched_act_connmark.patch3
-rw-r--r--target/linux/generic/patches-2.6.38/621-sched_act_connmark.patch3
-rw-r--r--target/linux/generic/patches-2.6.39/621-sched_act_connmark.patch3
-rw-r--r--target/linux/generic/patches-3.0/621-sched_act_connmark.patch3
6 files changed, 12 insertions, 6 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 734fd1cd1..1d1fc681a 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
+
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 286bdaec9..f571486cb 100644
--- 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
-@@ -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
module will be called act_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
+
diff --git a/target/linux/generic/patches-2.6.37/621-sched_act_connmark.patch b/target/linux/generic/patches-2.6.37/621-sched_act_connmark.patch
index 33429cb43..7df4b7260 100644
--- a/target/linux/generic/patches-2.6.37/621-sched_act_connmark.patch
+++ b/target/linux/generic/patches-2.6.37/621-sched_act_connmark.patch
@@ -140,7 +140,7 @@
+module_exit(connmark_cleanup_module);
--- a/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
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
+
diff --git a/target/linux/generic/patches-2.6.38/621-sched_act_connmark.patch b/target/linux/generic/patches-2.6.38/621-sched_act_connmark.patch
index 33429cb43..7df4b7260 100644
--- a/target/linux/generic/patches-2.6.38/621-sched_act_connmark.patch
+++ b/target/linux/generic/patches-2.6.38/621-sched_act_connmark.patch
@@ -140,7 +140,7 @@
+module_exit(connmark_cleanup_module);
--- a/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
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
+
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 c8c9b232a..537ded13d 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
+
diff --git a/target/linux/generic/patches-3.0/621-sched_act_connmark.patch b/target/linux/generic/patches-3.0/621-sched_act_connmark.patch
index 9704565e7..157421d20 100644
--- a/target/linux/generic/patches-3.0/621-sched_act_connmark.patch
+++ b/target/linux/generic/patches-3.0/621-sched_act_connmark.patch
@@ -140,7 +140,7 @@
+module_exit(connmark_cleanup_module);
--- a/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
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
+