aboutsummaryrefslogtreecommitdiffstats
path: root/net/batman-adv/originator.c
diff options
context:
space:
mode:
authorAntonio Quartulli <ordex@autistici.org>2012-11-10 05:00:32 -0500
committerAntonio Quartulli <ordex@autistici.org>2013-01-12 05:58:21 -0500
commitdec05074b1a322f5fbbe3f81bc438a75bfec3c34 (patch)
tree407f9281efb3f42c83773b07c4aae48cb5041937 /net/batman-adv/originator.c
parent8425ec6aea20f8c8e1783d7390f5ea6ca01c58e1 (diff)
batman-adv: Initialize lockdep class keys for hashes
Different hashes have the same class key because they get initialised with the same one. For this reason lockdep can create false warning when they are used recursively. Re-initialise the key for each hash after the invocation to hash_new() to avoid this problem. Signed-off-by: Antonio Quartulli <ordex@autistici.org> Tested-by: Linus Lüssing <linus.luessing@web.de> Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
Diffstat (limited to 'net/batman-adv/originator.c')
-rw-r--r--net/batman-adv/originator.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/net/batman-adv/originator.c b/net/batman-adv/originator.c
index 8c32cf1c2dec..109081c49bbd 100644
--- a/net/batman-adv/originator.c
+++ b/net/batman-adv/originator.c
@@ -29,6 +29,9 @@
29#include "soft-interface.h" 29#include "soft-interface.h"
30#include "bridge_loop_avoidance.h" 30#include "bridge_loop_avoidance.h"
31 31
32/* hash class keys */
33static struct lock_class_key batadv_orig_hash_lock_class_key;
34
32static void batadv_purge_orig(struct work_struct *work); 35static void batadv_purge_orig(struct work_struct *work);
33 36
34static void batadv_start_purge_timer(struct batadv_priv *bat_priv) 37static void batadv_start_purge_timer(struct batadv_priv *bat_priv)
@@ -57,6 +60,9 @@ int batadv_originator_init(struct batadv_priv *bat_priv)
57 if (!bat_priv->orig_hash) 60 if (!bat_priv->orig_hash)
58 goto err; 61 goto err;
59 62
63 batadv_hash_set_lock_class(bat_priv->orig_hash,
64 &batadv_orig_hash_lock_class_key);
65
60 batadv_start_purge_timer(bat_priv); 66 batadv_start_purge_timer(bat_priv);
61 return 0; 67 return 0;
62 68