Repository : ssh://git@diktynna/batman-adv

On branch : master

commit 350adcaec82fbaa358a2406343b6130ac8dad126 Author: Sven Eckelmann sven@narfation.org Date: Fri Apr 15 15:12:45 2022 +0200

batman-adv: compat: Add atomic mc_fowarding support for stable kernels

Fixes: 56db7c0540e7 ("batman-adv: make mc_forwarding atomic") Signed-off-by: Sven Eckelmann sven@narfation.org

350adcaec82fbaa358a2406343b6130ac8dad126 net/batman-adv/multicast.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/net/batman-adv/multicast.c b/net/batman-adv/multicast.c index 720c12c0..34897a15 100644 --- a/net/batman-adv/multicast.c +++ b/net/batman-adv/multicast.c @@ -135,7 +135,11 @@ static u8 batadv_mcast_mla_rtr_flags_softif_get_ipv6(struct net_device *dev) { struct inet6_dev *in6_dev = __in6_dev_get(dev);

-#if LINUX_VERSION_IS_GEQ(5, 18, 0) // UGLY_HACK_NEW +#if (LINUX_VERSION_IS_GEQ(5, 4, 189) && LINUX_VERSION_IS_LESS(5, 5, 0)) || /* UGLY_HACK */ \ + (LINUX_VERSION_IS_GEQ(5, 10, 111) && LINUX_VERSION_IS_LESS(5, 11, 0)) || /* UGLY_HACK */ \ + (LINUX_VERSION_IS_GEQ(5, 15, 34) && LINUX_VERSION_IS_LESS(5, 16, 0)) || /* UGLY_HACK */ \ + (LINUX_VERSION_IS_GEQ(5, 16, 20) && LINUX_VERSION_IS_LESS(5, 17, 0)) || /* UGLY_HACK */ \ + LINUX_VERSION_IS_GEQ(5, 17, 3) // UGLY_HACK_NEW if (in6_dev && atomic_read(&in6_dev->cnf.mc_forwarding)) #else // UGLY_HACK_OLD if (in6_dev && in6_dev->cnf.mc_forwarding)