Merge branch 'spectre' of git://git.armlinux.org.uk/~rmk/linux-arm

[linux.git] / net / bridge / br_multicast.c

diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c
index 41cdafbf2ebe52591ede41a1dc53473a41c5b843..6bac0d6b7b94137923ce29eac503518dcaa131d6 100644 (file)
--- a/net/bridge/br_multicast.c
+++ b/net/bridge/br_multicast.c
@@ -1428,8 +1428,7 @@ static void br_multicast_query_received(struct net_bridge *br,
         * is 0.0.0.0 should not be added to router port list.
         */
        if ((saddr->proto == htons(ETH_P_IP) && saddr->u.ip4) ||
-           (saddr->proto == htons(ETH_P_IPV6) &&
-            !ipv6_addr_any(&saddr->u.ip6)))
+           saddr->proto == htons(ETH_P_IPV6))
                br_multicast_mark_router(br, port);
 }