aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/backport-4.9
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2019-01-31 16:36:37 +0100
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2019-02-01 11:41:39 +0100
commit21762fe9d628acfdaa63d3d6ba2613e97bccb379 (patch)
tree7b91f4f3742e4708ce16cf9cf6dfee12c7c86348 /target/linux/generic/backport-4.9
parentab4183632117ab54868248419960506665234c71 (diff)
downloadupstream-21762fe9d628acfdaa63d3d6ba2613e97bccb379.tar.gz
upstream-21762fe9d628acfdaa63d3d6ba2613e97bccb379.tar.bz2
upstream-21762fe9d628acfdaa63d3d6ba2613e97bccb379.zip
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>
Diffstat (limited to 'target/linux/generic/backport-4.9')
-rw-r--r--target/linux/generic/backport-4.9/021-bridge-multicast-to-unicast.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/backport-4.9/021-bridge-multicast-to-unicast.patch b/target/linux/generic/backport-4.9/021-bridge-multicast-to-unicast.patch
index 7c36a767c7..4b7e8ba75a 100644
--- a/target/linux/generic/backport-4.9/021-bridge-multicast-to-unicast.patch
+++ b/target/linux/generic/backport-4.9/021-bridge-multicast-to-unicast.patch
@@ -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;