From: Felix Fietkau Date: Thu, 19 May 2016 15:55:34 +0000 (+0200) Subject: kernel: fix unaligned access issue in the bridge multicast-to-unicast patch X-Git-Tag: v17.01.0-rc1~2745 X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=commitdiff_plain;h=2c83003143485ae7cccc8776222afe2d9848c24d kernel: fix unaligned access issue in the bridge multicast-to-unicast patch Signed-off-by: Felix Fietkau --- diff --git a/target/linux/generic/patches-4.4/645-bridge_multicast_to_unicast.patch b/target/linux/generic/patches-4.4/645-bridge_multicast_to_unicast.patch index 7232b93de5..5d2103fe5c 100644 --- a/target/linux/generic/patches-4.4/645-bridge_multicast_to_unicast.patch +++ b/target/linux/generic/patches-4.4/645-bridge_multicast_to_unicast.patch @@ -300,17 +300,17 @@ Implement optinal multicast->unicast conversion for igmp snooping --- a/net/bridge/br_private.h +++ b/net/bridge/br_private.h -@@ -158,6 +158,9 @@ struct net_bridge_port_group { +@@ -157,7 +157,9 @@ struct net_bridge_port_group { + struct rcu_head rcu; struct timer_list timer; struct br_ip addr; - unsigned char state; -+ + unsigned char eth_addr[ETH_ALEN]; + unsigned char state; + bool unicast; }; struct net_bridge_mdb_entry -@@ -554,7 +557,8 @@ void br_multicast_free_pg(struct rcu_hea +@@ -554,7 +556,8 @@ void br_multicast_free_pg(struct rcu_hea struct net_bridge_port_group * br_multicast_new_port_group(struct net_bridge_port *port, struct br_ip *group, struct net_bridge_port_group __rcu *next,