Commit 008a3744 authored Nov 03, 2015 by Sven Eckelmann Committed by Antonio Quartulli Jan 09, 2016

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: 2c72d655 ("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>

parent 4a4d045e

net/batman-adv/main.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;