diff options
| author | Hauke Mehrtens <hauke@openwrt.org> | 2015-10-04 11:34:39 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@openwrt.org> | 2015-10-04 11:34:39 +0000 |
| commit | 94fab5804b6f68cf2c606b57866c2cb12306cbf2 (patch) | |
| tree | 643feda132ba5907f45408bc191b4501a4918284 /target/linux/generic/patches-4.1/645-bridge_multicast_to_unicast.patch | |
| parent | 145a1573469c39ebeaedeab2a3df09dea5db85fc (diff) | |
| download | master-187ad058-94fab5804b6f68cf2c606b57866c2cb12306cbf2.tar.gz master-187ad058-94fab5804b6f68cf2c606b57866c2cb12306cbf2.tar.bz2 master-187ad058-94fab5804b6f68cf2c606b57866c2cb12306cbf2.zip | |
kernel: update 4.1 to 4.1.10
Fixes a regression on spi flash devices (upstream commit 1583eaece6fa).
Changelogs:
* https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.1.7
* https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.1.8
* https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.1.9
* https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.1.10
096-ipv4-off-by-one-in-continuation-handling-in-proc-net.patch was applied
upstream and dropped.
Signed-off-by: Mathias Kresin <openwrt@kresin.me>
[update from 4.1.9 to 4.1.10]
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@47104 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-4.1/645-bridge_multicast_to_unicast.patch')
| -rw-r--r-- | target/linux/generic/patches-4.1/645-bridge_multicast_to_unicast.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/patches-4.1/645-bridge_multicast_to_unicast.patch b/target/linux/generic/patches-4.1/645-bridge_multicast_to_unicast.patch index d11a4a8fff..1ea6fc60e0 100644 --- a/target/linux/generic/patches-4.1/645-bridge_multicast_to_unicast.patch +++ b/target/linux/generic/patches-4.1/645-bridge_multicast_to_unicast.patch @@ -310,7 +310,7 @@ Implement optinal multicast->unicast conversion for igmp snooping rcu_assign_pointer(*pp, p); --- a/net/bridge/br_forward.c +++ b/net/bridge/br_forward.c -@@ -169,6 +169,34 @@ out: +@@ -170,6 +170,34 @@ out: return p; } @@ -345,7 +345,7 @@ Implement optinal multicast->unicast conversion for igmp snooping /* called under bridge lock */ static void br_flood(struct net_bridge *br, struct sk_buff *skb, struct sk_buff *skb0, -@@ -241,6 +269,7 @@ static void br_multicast_flood(struct ne +@@ -242,6 +270,7 @@ static void br_multicast_flood(struct ne struct net_bridge_port *prev = NULL; struct net_bridge_port_group *p; struct hlist_node *rp; @@ -353,7 +353,7 @@ Implement optinal multicast->unicast conversion for igmp snooping rp = rcu_dereference(hlist_first_rcu(&br->router_list)); p = mdst ? rcu_dereference(mdst->ports) : NULL; -@@ -251,10 +280,19 @@ static void br_multicast_flood(struct ne +@@ -252,10 +281,19 @@ static void br_multicast_flood(struct ne rport = rp ? hlist_entry(rp, struct net_bridge_port, rlist) : NULL; |