From: Linus Lüssing Date: Sun, 4 Mar 2018 12:08:17 +0000 (+0100) Subject: batman-adv: Fix multicast packet loss with a single WANT_ALL_IPV4/6 flag X-Git-Tag: v4.14.45~284 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5f8156fd34cf7d10a70f147130bc565857621732;p=platform%2Fkernel%2Flinux-rpi.git batman-adv: Fix multicast packet loss with a single WANT_ALL_IPV4/6 flag [ Upstream commit 74c12c630fe310eb7fcae1b292257d47781fff0a ] As the kernel doc describes too the code is supposed to skip adding multicast TT entries if both the WANT_ALL_IPV4 and WANT_ALL_IPV6 flags are present. Unfortunately, the current code even skips adding multicast TT entries if only either the WANT_ALL_IPV4 or WANT_ALL_IPV6 is present. This could lead to IPv6 multicast packet loss if only an IGMP but not an MLD querier is present for instance or vice versa. Fixes: 687937ab3489 ("batman-adv: Add multicast optimization support for bridged setups") Signed-off-by: Linus Lüssing Signed-off-by: Sven Eckelmann Signed-off-by: Simon Wunderlich Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- diff --git a/net/batman-adv/multicast.c b/net/batman-adv/multicast.c index d327670..df9e114 100644 --- a/net/batman-adv/multicast.c +++ b/net/batman-adv/multicast.c @@ -540,8 +540,8 @@ update: bat_priv->mcast.enabled = true; } - return !(mcast_data.flags & - (BATADV_MCAST_WANT_ALL_IPV4 | BATADV_MCAST_WANT_ALL_IPV6)); + return !(mcast_data.flags & BATADV_MCAST_WANT_ALL_IPV4 && + mcast_data.flags & BATADV_MCAST_WANT_ALL_IPV6); } /**