1
0
Fork 0

batman-adv: Fix multicast packet loss with a single WANT_ALL_IPV4/6 flag

[ Upstream commit 74c12c630f ]

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: 687937ab34 ("batman-adv: Add multicast optimization support for bridged setups")
Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue>
Signed-off-by: Sven Eckelmann <sven@narfation.org>
Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
pull/10/head
Linus Lüssing 2018-03-04 13:08:17 +01:00 committed by Greg Kroah-Hartman
parent 73ecd80bca
commit 5f8156fd34
1 changed files with 2 additions and 2 deletions

View File

@ -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);
}
/**