diff options
| author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-01-31 15:56:42 +0100 |
|---|---|---|
| committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-02-01 11:41:00 +0100 |
| commit | 604eb945508e32aeaf4dbfd5ffb5137de6223b38 (patch) | |
| tree | 9711eb5fd6441e42e9ef9d4c0c1a32b60ff84c44 /target/linux/generic/hack-4.9 | |
| parent | 9687cc855644e5649156e2a52ebca6fa61fc362f (diff) | |
| download | upstream-604eb945508e32aeaf4dbfd5ffb5137de6223b38.tar.gz upstream-604eb945508e32aeaf4dbfd5ffb5137de6223b38.tar.bz2 upstream-604eb945508e32aeaf4dbfd5ffb5137de6223b38.zip | |
kernel: bump 4.9 to 4.9.154
Refreshed all patches.
Adapted patches:
- 012-kbuild-add-macro-for-controlling-warnings-to-linux-c.patch
Compile-tested on: ar7
Runtime-tested on: none
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/generic/hack-4.9')
3 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/generic/hack-4.9/641-bridge_port_isolate.patch b/target/linux/generic/hack-4.9/641-bridge_port_isolate.patch index c545fa17ef..a436dd2b1e 100644 --- a/target/linux/generic/hack-4.9/641-bridge_port_isolate.patch +++ b/target/linux/generic/hack-4.9/641-bridge_port_isolate.patch @@ -25,7 +25,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> --- a/net/bridge/br_forward.c +++ b/net/bridge/br_forward.c -@@ -141,6 +141,9 @@ static int deliver_clone(const struct ne +@@ -140,6 +140,9 @@ static int deliver_clone(const struct ne void br_forward(const struct net_bridge_port *to, struct sk_buff *skb, bool local_rcv, bool local_orig) { @@ -35,7 +35,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> if (to && should_deliver(to, skb)) { if (local_rcv) deliver_clone(to, skb, local_orig); -@@ -206,6 +209,8 @@ void br_flood(struct net_bridge *br, str +@@ -205,6 +208,8 @@ void br_flood(struct net_bridge *br, str struct net_bridge_port *p; list_for_each_entry_rcu(p, &br->port_list, list) { diff --git a/target/linux/generic/hack-4.9/661-use_fq_codel_by_default.patch b/target/linux/generic/hack-4.9/661-use_fq_codel_by_default.patch index 981170cbb1..34fc2a37c3 100644 --- a/target/linux/generic/hack-4.9/661-use_fq_codel_by_default.patch +++ b/target/linux/generic/hack-4.9/661-use_fq_codel_by_default.patch @@ -44,7 +44,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> device, it has to decide which ones to send first, which ones to --- a/net/sched/sch_api.c +++ b/net/sched/sch_api.c -@@ -1978,7 +1978,7 @@ static int __init pktsched_init(void) +@@ -1977,7 +1977,7 @@ static int __init pktsched_init(void) return err; } diff --git a/target/linux/generic/hack-4.9/902-debloat_proc.patch b/target/linux/generic/hack-4.9/902-debloat_proc.patch index 5632d6ebda..91d1d28351 100644 --- a/target/linux/generic/hack-4.9/902-debloat_proc.patch +++ b/target/linux/generic/hack-4.9/902-debloat_proc.patch @@ -339,7 +339,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> --- a/net/ipv4/fib_trie.c +++ b/net/ipv4/fib_trie.c -@@ -2667,10 +2667,12 @@ static const struct file_operations fib_ +@@ -2677,10 +2677,12 @@ static const struct file_operations fib_ int __net_init fib_proc_init(struct net *net) { @@ -354,7 +354,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> &fib_triestat_fops)) goto out2; -@@ -2680,17 +2682,21 @@ int __net_init fib_proc_init(struct net +@@ -2690,17 +2692,21 @@ int __net_init fib_proc_init(struct net return 0; out3: |