The following commit has been merged in the master branch: commit fa452e0a609a038e5ef9d2e042bb80e08e1af7af Merge: a577223a97df241df26b91a95d03eec8c9fe0b36 6ee3c393eeb7d16a3c228c4fa23913b76c7e7df3 Author: Jakub Kicinski kuba@kernel.org Date: Wed Mar 2 21:58:02 2022 -0800
Merge tag 'batadv-next-pullrequest-20220302' of git://git.open-mesh.org/linux-merge
Simon Wunderlich says:
==================== This cleanup patchset includes the following patches:
- bump version strings, by Simon Wunderlich
- Remove redundant 'flush_workqueue()' calls, by Christophe JAILLET
- Migrate to linux/container_of.h, by Sven Eckelmann
- Demote batadv-on-batadv skip error message, by Sven Eckelmann
* tag 'batadv-next-pullrequest-20220302' of git://git.open-mesh.org/linux-merge: batman-adv: Demote batadv-on-batadv skip error message batman-adv: Migrate to linux/container_of.h batman-adv: Remove redundant 'flush_workqueue()' calls batman-adv: Start new development cycle ====================
Link: https://lore.kernel.org/r/20220302163522.102842-1-sw@simonwunderlich.de Signed-off-by: Jakub Kicinski kuba@kernel.org
diff --combined net/batman-adv/multicast.c index 9f311fddfaf9,1860de735661..b238455913df --- a/net/batman-adv/multicast.c +++ b/net/batman-adv/multicast.c @@@ -11,6 -11,7 +11,7 @@@ #include <linux/bitops.h> #include <linux/bug.h> #include <linux/byteorder/generic.h> + #include <linux/container_of.h> #include <linux/errno.h> #include <linux/etherdevice.h> #include <linux/gfp.h> @@@ -134,7 -135,7 +135,7 @@@ static u8 batadv_mcast_mla_rtr_flags_so { struct inet6_dev *in6_dev = __in6_dev_get(dev);
- if (in6_dev && in6_dev->cnf.mc_forwarding) + if (in6_dev && atomic_read(&in6_dev->cnf.mc_forwarding)) return BATADV_NO_FLAGS; else return BATADV_MCAST_WANT_NO_RTR6;