summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSven Eckelmann <sven@open-mesh.com>2015-11-03 19:20:34 +0100
committerAntonio Quartulli <a@unstable.cc>2016-01-09 20:56:00 +0800
commit008a374487070a391c12aa39288fd8511f822cab (patch)
tree9c3821eb6d6f9531a8a903feff683e23448090b9
parent4a4d045eb2c174472b68f366108bf76f1802f803 (diff)
downloadlinux-008a374487070a391c12aa39288fd8511f822cab.tar.gz
linux-008a374487070a391c12aa39288fd8511f822cab.tar.bz2
linux-008a374487070a391c12aa39288fd8511f822cab.zip
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>
-rw-r--r--net/batman-adv/main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c
index 5dbcb2e2b497..95fd418e9567 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;