The following commit has been merged in the master branch: commit 008a374487070a391c12aa39288fd8511f822cab Author: Sven Eckelmann sven@open-mesh.com Date: Tue Nov 3 19:20:34 2015 +0100

batman-adv: Fix lockdep annotation of batadv_tlv_container_remove

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

diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c index 5dbcb2e..95fd418 100644 --- a/net/batman-adv/main.c +++ b/net/batman-adv/main.c @@ -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;