diff options
| author | Felix Fietkau <nbd@nbd.name> | 2016-05-19 17:55:34 +0200 |
|---|---|---|
| committer | Felix Fietkau <nbd@nbd.name> | 2016-05-19 17:55:54 +0200 |
| commit | 2c83003143485ae7cccc8776222afe2d9848c24d (patch) | |
| tree | 9401f58ef2caedccfa4e4c2f6184b3cc27f2b9f8 /target/linux/generic | |
| parent | 24270e9493e0832c4976c7001e527f4a2b9b761e (diff) | |
| download | master-31e0f0ae-2c83003143485ae7cccc8776222afe2d9848c24d.tar.gz master-31e0f0ae-2c83003143485ae7cccc8776222afe2d9848c24d.tar.bz2 master-31e0f0ae-2c83003143485ae7cccc8776222afe2d9848c24d.zip | |
kernel: fix unaligned access issue in the bridge multicast-to-unicast patch
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Diffstat (limited to 'target/linux/generic')
| -rw-r--r-- | target/linux/generic/patches-4.4/645-bridge_multicast_to_unicast.patch | 8 |
1 files changed, 4 insertions, 4 deletions
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, |