diff options
| author | David S. Miller <davem@davemloft.net> | 2019-05-09 18:44:17 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-05-09 18:44:17 +0200 |
| commit | d7e163ced48f942c9a307117e15b0f863a01bc1e (patch) | |
| tree | af9b356a71bf6b9b25c8c7f0fd3d4829d363f2a4 /net/batman-adv/main.c | |
| parent | aqc111: fix double endianness swap on BE (diff) | |
| parent | batman-adv: mcast: fix multicast tt/tvlv worker locking (diff) | |
| download | linux-d7e163ced48f942c9a307117e15b0f863a01bc1e.tar.xz linux-d7e163ced48f942c9a307117e15b0f863a01bc1e.zip | |
Merge tag 'batadv-net-for-davem-20190509' of git://git.open-mesh.org/linux-merge
Simon Wunderlich says:
====================
This feature/cleanup patchset includes the following patches:
- bump version strings, by Simon Wunderlich (we forgot to include
this patch previously ...)
- fix multicast tt/tvlv worker locking, by Linus Lüssing
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/batman-adv/main.c')
| -rw-r--r-- | net/batman-adv/main.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c index dabcaff87e34..4a89177def64 100644 --- a/net/batman-adv/main.c +++ b/net/batman-adv/main.c @@ -168,6 +168,7 @@ int batadv_mesh_init(struct net_device *soft_iface) spin_lock_init(&bat_priv->tt.commit_lock); spin_lock_init(&bat_priv->gw.list_lock); #ifdef CONFIG_BATMAN_ADV_MCAST + spin_lock_init(&bat_priv->mcast.mla_lock); spin_lock_init(&bat_priv->mcast.want_lists_lock); #endif spin_lock_init(&bat_priv->tvlv.container_list_lock); |