35 lines
1.4 KiB
Diff
35 lines
1.4 KiB
Diff
From: Linus Lüssing <linus.luessing@c0d3.blue>
|
|
Date: Sun, 4 Mar 2018 13:08:17 +0100
|
|
Subject: 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: 391b59cdb111 ("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>
|
|
|
|
Origin: upstream, https://git.open-mesh.org/batman-adv.git/commit/edba00d56efb1d55cdd40957e010fba80580b5e2
|
|
|
|
diff --git a/net/batman-adv/multicast.c b/net/batman-adv/multicast.c
|
|
index 090a69fc342eac8a0b6bf89556d2b32523817d09..1fb4f87be11e984f3a839c0b2dea939cd692b04d 100644
|
|
--- a/net/batman-adv/multicast.c
|
|
+++ b/net/batman-adv/multicast.c
|
|
@@ -541,8 +541,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);
|
|
}
|
|
|
|
/**
|