ar71xx: move micrel PHY driver to the generic linux target

[openwrt.git] / target / linux / generic / patches-2.6.32 / 280-sched_act_connmark.patch

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 734fd1c..1d1fc68 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,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.
  
          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
 +