47cd2a4b62
* support latest kernels (4.4 - 5.14) * coding style cleanups and refactoring * add MRD + routable IPv4 multicast with bridges support * rewrite of broadcast queuing * bugs squashed: - avoid kernel warnings on timing related checks Signed-off-by: Sven Eckelmann <sven@narfation.org>
36 lines
1.2 KiB
Diff
36 lines
1.2 KiB
Diff
From: Sven Eckelmann <sven@narfation.org>
|
|
Date: Fri, 14 May 2021 19:34:35 +0200
|
|
Subject: batman-adv: Fix build of multicast code against Linux < 5.13
|
|
|
|
Fixes: 007b4c4b031f ("batman-adv: convert ifmcaddr6 to RCU")
|
|
Signed-off-by: Sven Eckelmann <sven@narfation.org>
|
|
|
|
diff --git a/net/batman-adv/multicast.c b/net/batman-adv/multicast.c
|
|
index 923e2197c2db008ba1cd9b80422ec8481c6a8185..004dc67de076d524784988d2fc8ec7396a00042b 100644
|
|
--- a/net/batman-adv/multicast.c
|
|
+++ b/net/batman-adv/multicast.c
|
|
@@ -423,9 +423,14 @@ batadv_mcast_mla_softif_get_ipv6(struct net_device *dev,
|
|
return 0;
|
|
}
|
|
|
|
+#if LINUX_VERSION_IS_LESS(5, 13, 0)
|
|
+ read_lock_bh(&in6_dev->lock);
|
|
+ for (pmc6 = in6_dev->mc_list; pmc6; pmc6 = pmc6->next) {
|
|
+#else
|
|
for (pmc6 = rcu_dereference(in6_dev->mc_list);
|
|
pmc6;
|
|
pmc6 = rcu_dereference(pmc6->next)) {
|
|
+#endif
|
|
if (IPV6_ADDR_MC_SCOPE(&pmc6->mca_addr) <
|
|
IPV6_ADDR_SCOPE_LINKLOCAL)
|
|
continue;
|
|
@@ -454,6 +459,9 @@ batadv_mcast_mla_softif_get_ipv6(struct net_device *dev,
|
|
hlist_add_head(&new->list, mcast_list);
|
|
ret++;
|
|
}
|
|
+#if LINUX_VERSION_IS_LESS(5, 13, 0)
|
|
+ read_unlock_bh(&in6_dev->lock);
|
|
+#endif
|
|
rcu_read_unlock();
|
|
|
|
return ret;
|