summaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-2.6.38/290-sched_act_connmark.patch
diff options
context:
space:
mode:
authorkaloz <kaloz@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-03-01 11:24:08 +0000
committerkaloz <kaloz@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-03-01 11:24:08 +0000
commita0a75427ac2604fa264a967fb0eb670b45486d01 (patch)
tree3ce5fdafca4a5403fab2827275d31023075d4036 /target/linux/generic/patches-2.6.38/290-sched_act_connmark.patch
parent2ebb168ddbab58e9c454631dd181dcf87b031585 (diff)
[generic/2.6.38]: refresh patches with -rc6
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@25805 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-2.6.38/290-sched_act_connmark.patch')
-rw-r--r--target/linux/generic/patches-2.6.38/290-sched_act_connmark.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/patches-2.6.38/290-sched_act_connmark.patch b/target/linux/generic/patches-2.6.38/290-sched_act_connmark.patch
index 013c116c4..33429cb43 100644
--- a/target/linux/generic/patches-2.6.38/290-sched_act_connmark.patch
+++ b/target/linux/generic/patches-2.6.38/290-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 @@
+@@ -559,6 +559,18 @@ config NET_ACT_CSUM
To compile this code as a module, choose M here: the
module will be called act_csum.
@@ -161,7 +161,7 @@
depends on NET_CLS_U32 || NET_CLS_FW
--- a/net/sched/Makefile
+++ b/net/sched/Makefile
-@@ -16,6 +16,7 @@
+@@ -16,6 +16,7 @@ obj-$(CONFIG_NET_ACT_PEDIT) += act_pedit
obj-$(CONFIG_NET_ACT_SIMP) += act_simple.o
obj-$(CONFIG_NET_ACT_SKBEDIT) += act_skbedit.o
obj-$(CONFIG_NET_ACT_CSUM) += act_csum.o