kernel: bump 4.9 to 4.9.154
Refreshed all patches. Compile-tested on: ar71xx Runtime-tested on: ar71xx Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
This commit is contained in:
@@ -51,7 +51,7 @@ Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue>
|
||||
#define IFLA_BRPORT_MAX (__IFLA_BRPORT_MAX - 1)
|
||||
--- a/net/bridge/br_forward.c
|
||||
+++ b/net/bridge/br_forward.c
|
||||
@@ -174,6 +174,29 @@ out:
|
||||
@@ -173,6 +173,29 @@ out:
|
||||
return p;
|
||||
}
|
||||
|
||||
@@ -81,7 +81,7 @@ Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue>
|
||||
/* called under rcu_read_lock */
|
||||
void br_flood(struct net_bridge *br, struct sk_buff *skb,
|
||||
enum br_pkt_type pkt_type, bool local_rcv, bool local_orig)
|
||||
@@ -242,10 +265,20 @@ void br_multicast_flood(struct net_bridg
|
||||
@@ -241,10 +264,20 @@ void br_multicast_flood(struct net_bridg
|
||||
rport = rp ? hlist_entry(rp, struct net_bridge_port, rlist) :
|
||||
NULL;
|
||||
|
||||
|
||||
@@ -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) {
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
|
||||
@@ -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:
|
||||
|
||||
@@ -66,7 +66,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
|
||||
static void rt_fibinfo_free(struct rtable __rcu **rtp)
|
||||
--- a/net/ipv4/fib_trie.c
|
||||
+++ b/net/ipv4/fib_trie.c
|
||||
@@ -2396,6 +2396,7 @@ static const char *const rtn_type_names[
|
||||
@@ -2406,6 +2406,7 @@ static const char *const rtn_type_names[
|
||||
[RTN_THROW] = "THROW",
|
||||
[RTN_NAT] = "NAT",
|
||||
[RTN_XRESOLVE] = "XRESOLVE",
|
||||
|
||||
Reference in New Issue
Block a user