kernel: fix unaligned access issue in the bridge multicast-to-unicast patch

Signed-off-by: Felix Fietkau <nbd@nbd.name>

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 7232b93de5f80506a253abd9a0eeb96f69d1e59b..5d2103fe5c7844a1966e8df825cf67fa698d5355 100644 (file)
--- 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
  
 --- 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;
        struct timer_list               timer;
        struct br_ip                    addr;

-       unsigned char                   state;
-+

 +      unsigned char                   eth_addr[ETH_ALEN];
 +      unsigned char                   eth_addr[ETH_ALEN];

+       unsigned char                   state;

 +      bool                            unicast;
  };
  
  struct net_bridge_mdb_entry
 +      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,
  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,