diff options
| author | David S. Miller <davem@davemloft.net> | 2019-10-28 16:39:07 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-10-28 16:39:07 -0700 |
| commit | 55793d2a431c184c8b9774f5df41d7f533505d8e (patch) | |
| tree | 5824f04586305105333a55553ea81838ccf75011 /net/batman-adv/hard-interface.c | |
| parent | 0a29ac5bd3a988dc151c8d26910dec2557421f64 (diff) | |
| parent | 40e220b4218bb3d278e5e8cc04ccdfd1c7ff8307 (diff) | |
Merge tag 'batadv-net-for-davem-20191025' of git://git.open-mesh.org/linux-merge
Simon Wunderlich says:
====================
Here are two batman-adv bugfixes:
* Fix free/alloc race for OGM and OGMv2, by Sven Eckelmann (2 patches)
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/batman-adv/hard-interface.c')
| -rw-r--r-- | net/batman-adv/hard-interface.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c index c90e47342bb0..afb52282d5bd 100644 --- a/net/batman-adv/hard-interface.c +++ b/net/batman-adv/hard-interface.c @@ -18,6 +18,7 @@ #include <linux/kref.h> #include <linux/limits.h> #include <linux/list.h> +#include <linux/mutex.h> #include <linux/netdevice.h> #include <linux/printk.h> #include <linux/rculist.h> @@ -929,6 +930,7 @@ batadv_hardif_add_interface(struct net_device *net_dev) INIT_LIST_HEAD(&hard_iface->list); INIT_HLIST_HEAD(&hard_iface->neigh_list); + mutex_init(&hard_iface->bat_iv.ogm_buff_mutex); spin_lock_init(&hard_iface->neigh_list_lock); kref_init(&hard_iface->refcount); |