aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm2708/patches-4.4
diff options
context:
space:
mode:
authorStijn Tintel <stijn@linux-ipv6.be>2016-11-16 15:59:43 +0100
committerStijn Tintel <stijn@linux-ipv6.be>2016-11-16 17:31:29 +0100
commit8e47655d4e979d65c7e488faea4e1fcca8e4cddc (patch)
tree0405f183fc75a17e64b0a5a1b98432051279105f /target/linux/brcm2708/patches-4.4
parentc437a671525d4fa01f69e57effee76da09d6761f (diff)
downloadupstream-8e47655d4e979d65c7e488faea4e1fcca8e4cddc.tar.gz
upstream-8e47655d4e979d65c7e488faea4e1fcca8e4cddc.tar.bz2
upstream-8e47655d4e979d65c7e488faea4e1fcca8e4cddc.zip
kernel: update kernel 4.4 to version 4.4.32
Refresh patches for all targets that support kernel 4.4. Compile-tested on all targets that use kernel 4.4 and aren't marked broken. Runtime-tested on ar71xx, octeon. Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
Diffstat (limited to 'target/linux/brcm2708/patches-4.4')
-rw-r--r--target/linux/brcm2708/patches-4.4/0061-config-Enable-CONFIG_MEMCG-but-leave-it-disabled-due.patch4
-rw-r--r--target/linux/brcm2708/patches-4.4/0220-net-sched-add-skb_at_tc_ingress-helper.patch19
2 files changed, 2 insertions, 21 deletions
diff --git a/target/linux/brcm2708/patches-4.4/0061-config-Enable-CONFIG_MEMCG-but-leave-it-disabled-due.patch b/target/linux/brcm2708/patches-4.4/0061-config-Enable-CONFIG_MEMCG-but-leave-it-disabled-due.patch
index 662d90dd2c..72bd250b9f 100644
--- a/target/linux/brcm2708/patches-4.4/0061-config-Enable-CONFIG_MEMCG-but-leave-it-disabled-due.patch
+++ b/target/linux/brcm2708/patches-4.4/0061-config-Enable-CONFIG_MEMCG-but-leave-it-disabled-due.patch
@@ -10,7 +10,7 @@ Subject: [PATCH] config: Enable CONFIG_MEMCG, but leave it disabled (due to
--- a/kernel/cgroup.c
+++ b/kernel/cgroup.c
-@@ -5307,7 +5307,7 @@ int __init cgroup_init_early(void)
+@@ -5310,7 +5310,7 @@ int __init cgroup_init_early(void)
return 0;
}
@@ -19,7 +19,7 @@ Subject: [PATCH] config: Enable CONFIG_MEMCG, but leave it disabled (due to
/**
* cgroup_init - cgroup initialization
-@@ -5803,6 +5803,27 @@ static int __init cgroup_disable(char *s
+@@ -5806,6 +5806,27 @@ static int __init cgroup_disable(char *s
}
__setup("cgroup_disable=", cgroup_disable);
diff --git a/target/linux/brcm2708/patches-4.4/0220-net-sched-add-skb_at_tc_ingress-helper.patch b/target/linux/brcm2708/patches-4.4/0220-net-sched-add-skb_at_tc_ingress-helper.patch
index 38f86fd9b7..8264f99210 100644
--- a/target/linux/brcm2708/patches-4.4/0220-net-sched-add-skb_at_tc_ingress-helper.patch
+++ b/target/linux/brcm2708/patches-4.4/0220-net-sched-add-skb_at_tc_ingress-helper.patch
@@ -10,28 +10,9 @@ Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Acked-by: Alexei Starovoitov <ast@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
---
- include/net/sch_generic.h | 9 +++++++++
net/sched/cls_bpf.c | 6 +-----
2 files changed, 10 insertions(+), 5 deletions(-)
---- a/include/net/sch_generic.h
-+++ b/include/net/sch_generic.h
-@@ -409,6 +409,15 @@ bool tcf_destroy(struct tcf_proto *tp, b
- void tcf_destroy_chain(struct tcf_proto __rcu **fl);
- int skb_do_redirect(struct sk_buff *);
-
-+static inline bool skb_at_tc_ingress(const struct sk_buff *skb)
-+{
-+#ifdef CONFIG_NET_CLS_ACT
-+ return G_TC_AT(skb->tc_verd) & AT_INGRESS;
-+#else
-+ return false;
-+#endif
-+}
-+
- /* Reset all TX qdiscs greater then index of a device. */
- static inline void qdisc_reset_all_tx_gt(struct net_device *dev, unsigned int i)
- {
--- a/net/sched/cls_bpf.c
+++ b/net/sched/cls_bpf.c
@@ -79,12 +79,8 @@ static int cls_bpf_classify(struct sk_bu