[kernel/2.6.38] fix gcc-4.6 set but unused warnings

[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 e02d1bc..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
-@@ -549,6 +549,18 @@
+@@ -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
 +
@@ -161,7 +162,7 @@
        depends on NET_CLS_U32 || NET_CLS_FW
 --- a/net/sched/Makefile
 +++ b/net/sched/Makefile
-@@ -15,6 +15,7 @@
+@@ -15,6 +15,7 @@ obj-$(CONFIG_NET_ACT_NAT)    += act_nat.o
  obj-$(CONFIG_NET_ACT_PEDIT)   += act_pedit.o
  obj-$(CONFIG_NET_ACT_SIMP)    += act_simple.o
  obj-$(CONFIG_NET_ACT_SKBEDIT) += act_skbedit.o