generic: add support for the EON EN25Q64 SPI flash chip

[openwrt/svn-archive/archive.git] / target / linux / generic / patches-3.3 / 621-sched_act_connmark.patch

diff --git a/target/linux/generic/patches-3.3/621-sched_act_connmark.patch b/target/linux/generic/patches-3.3/621-sched_act_connmark.patch
index 157421d2092bd59e62285e211286a63572bce5c5..b6adce1febd0979cbdad8b022ee9b5dbfb92a765 100644 (file)
--- a/target/linux/generic/patches-3.3/621-sched_act_connmark.patch
+++ b/target/linux/generic/patches-3.3/621-sched_act_connmark.patch
@@ -46,7 +46,7 @@
 +      .lock   =       &connmark_lock,
 +};
 +
-+static int tcf_connmark(struct sk_buff *skb, struct tc_action *a,
++static int tcf_connmark(struct sk_buff *skb, const struct tc_action *a,
 +                     struct tcf_result *res)
 +{
 +      struct nf_conn *c;
@@ -140,7 +140,7 @@
 +module_exit(connmark_cleanup_module);
 --- a/net/sched/Kconfig
 +++ b/net/sched/Kconfig
-@@ -602,6 +602,19 @@ config NET_ACT_CSUM
+@@ -624,6 +624,19 @@ config NET_ACT_CSUM
          To compile this code as a module, choose M here: the
          module will be called act_csum.