]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
batman-adv: Fix lockdep annotation of batadv_tlv_container_remove
authorSven Eckelmann <sven@open-mesh.com>
Tue, 3 Nov 2015 18:20:34 +0000 (19:20 +0100)
committerAntonio Quartulli <a@unstable.cc>
Sat, 9 Jan 2016 12:56:00 +0000 (20:56 +0800)
The function handles tlv containers and not tlv handlers. Thus the
lockdep_assert_held has to check for the container_list lock.

Fixes: 2c72d655b044 ("batman-adv: Annotate deleting functions with external lock via lockdep")
Signed-off-by: Sven Eckelmann <sven@open-mesh.com>
Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
Signed-off-by: Antonio Quartulli <a@unstable.cc>
net/batman-adv/main.c

index 5dbcb2e2b497ce7eb47821aa7ddea3ebb64060f3..95fd418e95673d7f988b312fe11ae3e71cd11c10 100644 (file)
@@ -747,7 +747,7 @@ static u16 batadv_tvlv_container_list_size(struct batadv_priv *bat_priv)
 static void batadv_tvlv_container_remove(struct batadv_priv *bat_priv,
                                         struct batadv_tvlv_container *tvlv)
 {
-       lockdep_assert_held(&bat_priv->tvlv.handler_list_lock);
+       lockdep_assert_held(&bat_priv->tvlv.container_list_lock);
 
        if (!tvlv)
                return;