diff options
author | Linus Lüssing <linus.luessing@c0d3.blue> | 2018-03-04 13:08:17 +0100 |
---|---|---|
committer | Simon Wunderlich <sw@simonwunderlich.de> | 2018-03-04 13:50:02 +0100 |
commit | 74c12c630fe310eb7fcae1b292257d47781fff0a (patch) | |
tree | a2079ce4a98f91ceb74bd3fe51f72666e54ae4ce | |
parent | f22e08932c2960f29b5e828e745c9f3fb7c1bb86 (diff) | |
download | linux-stable-74c12c630fe310eb7fcae1b292257d47781fff0a.tar.gz linux-stable-74c12c630fe310eb7fcae1b292257d47781fff0a.tar.bz2 linux-stable-74c12c630fe310eb7fcae1b292257d47781fff0a.zip |
batman-adv: Fix multicast packet loss with a single WANT_ALL_IPV4/6 flag
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 <linus.luessing@c0d3.blue>
Signed-off-by: Sven Eckelmann <sven@narfation.org>
Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
-rw-r--r-- | net/batman-adv/multicast.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/batman-adv/multicast.c b/net/batman-adv/multicast.c index cbdeb47ec3f6..d70640135e3a 100644 --- a/net/batman-adv/multicast.c +++ b/net/batman-adv/multicast.c @@ -543,8 +543,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); } /** |