projects
/
librecmc
/
librecmc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c525603
)
sched_connmark depends on NF_CONNTRACK_MARK (#8976, #9423)
author
Florian Fainelli
<florian@openwrt.org>
Tue, 5 Jul 2011 12:40:50 +0000
(12:40 +0000)
committer
Florian Fainelli
<florian@openwrt.org>
Tue, 5 Jul 2011 12:40:50 +0000
(12:40 +0000)
SVN-Revision: 27457
target/linux/generic/patches-2.6.32/280-sched_act_connmark.patch
patch
|
blob
|
history
target/linux/generic/patches-2.6.36/290-sched_act_connmark.patch
patch
|
blob
|
history
target/linux/generic/patches-2.6.37/621-sched_act_connmark.patch
patch
|
blob
|
history
target/linux/generic/patches-2.6.38/621-sched_act_connmark.patch
patch
|
blob
|
history
target/linux/generic/patches-2.6.39/621-sched_act_connmark.patch
patch
|
blob
|
history
target/linux/generic/patches-3.0/621-sched_act_connmark.patch
patch
|
blob
|
history
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 734fd1cd14097b911ad3db4f06803005bd72854f..1d1fc681a2e136feea129d268518efa4f41cff17 100644
(file)
--- 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
+module_exit(connmark_cleanup_module);
--- a/net/sched/Kconfig
+++ b/net/sched/Kconfig
-@@ -546,6 +546,1
8
@@ config NET_ACT_SKBEDIT
+@@ -546,6 +546,1
9
@@ config NET_ACT_SKBEDIT
To compile this code as a module, choose M here: the
module will be called 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
+ 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
+
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 286bdaec98b64a9d1e19d19e3a1ec375ff61b39a..f571486cb80494ae55c023dbde17c79cd4ccfdab 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
+
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 33429cb43087f7ba4eeaa8e400ecc7bebd04fe3d..7df4b7260991656649cd25b035fcfc145f37f386 100644
(file)
--- 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
+module_exit(connmark_cleanup_module);
--- a/net/sched/Kconfig
+++ b/net/sched/Kconfig
-@@ -559,6 +559,1
8
@@ config NET_ACT_CSUM
+@@ -559,6 +559,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
+
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 33429cb43087f7ba4eeaa8e400ecc7bebd04fe3d..7df4b7260991656649cd25b035fcfc145f37f386 100644
(file)
--- 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
+module_exit(connmark_cleanup_module);
--- a/net/sched/Kconfig
+++ b/net/sched/Kconfig
-@@ -559,6 +559,1
8
@@ config NET_ACT_CSUM
+@@ -559,6 +559,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
+
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
+
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 9704565e7a303a057d9fa4af7e36564c48e221ea..157421d2092bd59e62285e211286a63572bce5c5 100644
(file)
--- 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
+module_exit(connmark_cleanup_module);
--- a/net/sched/Kconfig
+++ b/net/sched/Kconfig
-@@ -602,6 +602,1
8
@@ config NET_ACT_CSUM
+@@ -602,6 +602,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
+