batman-adv: update to version 2021.3

[feed/routing.git] / batman-adv / patches / 0003-batman-adv-Fix-build-of-multicast-code-against-Linux.patch

diff --git a/batman-adv/patches/0003-batman-adv-Fix-build-of-multicast-code-against-Linux.patch b/batman-adv/patches/0003-batman-adv-Fix-build-of-multicast-code-against-Linux.patch
index 7a290db248b293c890ba4aa543868edf789a038e..6fecb6cd3778ce61d474adf3ffe712c8012e38b6 100644 (file)
--- a/batman-adv/patches/0003-batman-adv-Fix-build-of-multicast-code-against-Linux.patch
+++ b/batman-adv/patches/0003-batman-adv-Fix-build-of-multicast-code-against-Linux.patch
@@ -5,11 +5,9 @@ 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,
+@@ -422,9 +422,14 @@ batadv_mcast_mla_softif_get_ipv6(struct
                return 0;
        }
  
@@ -24,7 +22,7 @@ index 923e2197c2db008ba1cd9b80422ec8481c6a8185..004dc67de076d524784988d2fc8ec739
                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,
+@@ -453,6 +458,9 @@ batadv_mcast_mla_softif_get_ipv6(struct
                hlist_add_head(&new->list, mcast_list);
                ret++;
        }