Repository : ssh://git@open-mesh.org/batman-adv

On branch : master

commit 41a559a1d48b6fbb17690b7bdcc155668a8e751d Author: Sven Eckelmann sven@open-mesh.com Date: Tue Nov 3 17:43:05 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: 5b95c427d187 ("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

41a559a1d48b6fbb17690b7bdcc155668a8e751d net/batman-adv/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c index 062d319..a8dcab8 100644 --- a/net/batman-adv/main.c +++ b/net/batman-adv/main.c @@ -749,7 +749,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;