69cbaba4f4
With batman-adv 2022.0 support for directed multicast in bridged setups for routeable multicast addresses was refined - if the Linux kernel is 5.14 or higher. This backports the according changes made to the Linux bridge in 5.14 and kernel exports to 5.10, to allow batman-adv to tap into and use the Linux bridge's Multicast Router Discovery (RFC4286) based multicast router state. Which enables the batman-adv multicast optimizations not only for IPv6 link-local multicast addresses (ffX2::/16) but now also IPv6 routeable multicast addresses (ffXY::/16, with Y > 2) in Gluon. Note that since batman-adv v2019.3 with a Linux < 5.14 multicast routers were initially "guessed" by checking for listeners on ff02::2 (all-routers). Which could potentially overestimate - like in our case: This approach won't work for us, as every Gluon node listens on ff02::2 on the local-node interface due to Gluon's radvd for local IPv6 prefix assignments. Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue>
45 lines
1.5 KiB
Diff
45 lines
1.5 KiB
Diff
From: Linus Lüssing <linus.luessing@c0d3.blue>
|
|
Date: Fri, 19 Aug 2022 20:23:11 +0200
|
|
Subject: batman-adv: compat: use backported bridge MRD support for 5.10
|
|
|
|
The per protocol family Multicast Router Discovery support was
|
|
backported from Linux 5.14 to Linux 5.10. As well as the bridge exports
|
|
added in 5.14 for batman-adv to retrieve the more accurate MRD based
|
|
multicast router state, compared to the previous "guessing" on ff02::2
|
|
approach to detect IPv6 multicast routers..
|
|
|
|
This enables the use of routable multicast addresses in bridged setups
|
|
in batman-adv's multicast optimizations.
|
|
|
|
Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue>
|
|
|
|
diff --git a/batman-adv/src/compat-hacks.h b/batman-adv/src/compat-hacks.h
|
|
index 99a1bb39fedcbd2069a0f790a624fdeaed12b47c..dd9122cb44f3931b8d95c74d76856c6c690205f3 100644
|
|
--- a/batman-adv/src/compat-hacks.h
|
|
+++ b/batman-adv/src/compat-hacks.h
|
|
@@ -47,10 +47,6 @@ inline void __batadv_br_ip_list_check(void)
|
|
#define br_ip batadv_br_ip
|
|
#define br_ip_list batadv_br_ip_list
|
|
|
|
-#endif /* LINUX_VERSION_IS_LESS(5, 10, 0) */
|
|
-
|
|
-#if LINUX_VERSION_IS_LESS(5, 14, 0)
|
|
-
|
|
#include <linux/if_bridge.h>
|
|
#include <net/addrconf.h>
|
|
|
|
@@ -90,10 +86,12 @@ br_multicast_has_router_adjacent(struct net_device *dev, int proto)
|
|
}
|
|
#endif
|
|
|
|
-#endif /* LINUX_VERSION_IS_LESS(5, 14, 0) */
|
|
+#endif /* LINUX_VERSION_IS_LESS(5, 10, 0) */
|
|
|
|
#if LINUX_VERSION_IS_LESS(5, 15, 0)
|
|
|
|
+#include <linux/etherdevice.h>
|
|
+
|
|
static inline void batadv_eth_hw_addr_set(struct net_device *dev,
|
|
const u8 *addr)
|
|
{
|