Merge tag 'devprop-5.10-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...

[linux-2.6-microblaze.git] / net / batman-adv / multicast.c

diff --git a/net/batman-adv/multicast.c b/net/batman-adv/multicast.c
index ca24a2e..9af99c3 100644 (file)
--- a/net/batman-adv/multicast.c
+++ b/net/batman-adv/multicast.c
@@ -208,7 +208,7 @@ static u8 batadv_mcast_mla_rtr_flags_bridge_get(struct batadv_priv *bat_priv,
                return BATADV_MCAST_WANT_NO_RTR4 | BATADV_MCAST_WANT_NO_RTR6;
 
        /* TODO: ask the bridge if a multicast router is present (the bridge
-        * is capable of performing proper RFC4286 multicast multicast router
+        * is capable of performing proper RFC4286 multicast router
         * discovery) instead of searching for a ff02::2 listener here
         */
        ret = br_multicast_list_adjacent(dev, &bridge_mcast_list);
@@ -221,7 +221,7 @@ static u8 batadv_mcast_mla_rtr_flags_bridge_get(struct batadv_priv *bat_priv,
                 * address here, only IPv6 ones
                 */
                if (br_ip_entry->addr.proto == htons(ETH_P_IPV6) &&
-                   ipv6_addr_is_ll_all_routers(&br_ip_entry->addr.u.ip6))
+                   ipv6_addr_is_ll_all_routers(&br_ip_entry->addr.dst.ip6))
                        flags &= ~BATADV_MCAST_WANT_NO_RTR6;
 
                list_del(&br_ip_entry->list);
@@ -562,10 +562,10 @@ out:
 static void batadv_mcast_mla_br_addr_cpy(char *dst, const struct br_ip *src)
 {
        if (src->proto == htons(ETH_P_IP))
-               ip_eth_mc_map(src->u.ip4, dst);
+               ip_eth_mc_map(src->dst.ip4, dst);
 #if IS_ENABLED(CONFIG_IPV6)
        else if (src->proto == htons(ETH_P_IPV6))
-               ipv6_eth_mc_map(&src->u.ip6, dst);
+               ipv6_eth_mc_map(&src->dst.ip6, dst);
 #endif
        else
                eth_zero_addr(dst);
@@ -609,11 +609,11 @@ static int batadv_mcast_mla_bridge_get(struct net_device *dev,
                                continue;
 
                        if (tvlv_flags & BATADV_MCAST_WANT_ALL_UNSNOOPABLES &&
-                           ipv4_is_local_multicast(br_ip_entry->addr.u.ip4))
+                           ipv4_is_local_multicast(br_ip_entry->addr.dst.ip4))
                                continue;
 
                        if (!(tvlv_flags & BATADV_MCAST_WANT_NO_RTR4) &&
-                           !ipv4_is_local_multicast(br_ip_entry->addr.u.ip4))
+                           !ipv4_is_local_multicast(br_ip_entry->addr.dst.ip4))
                                continue;
                }
 
@@ -623,11 +623,11 @@ static int batadv_mcast_mla_bridge_get(struct net_device *dev,
                                continue;
 
                        if (tvlv_flags & BATADV_MCAST_WANT_ALL_UNSNOOPABLES &&
-                           ipv6_addr_is_ll_all_nodes(&br_ip_entry->addr.u.ip6))
+                           ipv6_addr_is_ll_all_nodes(&br_ip_entry->addr.dst.ip6))
                                continue;
 
                        if (!(tvlv_flags & BATADV_MCAST_WANT_NO_RTR6) &&
-                           IPV6_ADDR_MC_SCOPE(&br_ip_entry->addr.u.ip6) >
+                           IPV6_ADDR_MC_SCOPE(&br_ip_entry->addr.dst.ip6) >
                            IPV6_ADDR_SCOPE_LINKLOCAL)
                                continue;
                }