summaryrefslogtreecommitdiffstats
path: root/net/batman-adv/originator.c
diff options
context:
space:
mode:
authorAntonio Quartulli <ordex@autistici.org>2012-11-10 11:00:32 +0100
committerAntonio Quartulli <ordex@autistici.org>2013-01-12 20:58:21 +1000
commitdec05074b1a322f5fbbe3f81bc438a75bfec3c34 (patch)
tree407f9281efb3f42c83773b07c4aae48cb5041937 /net/batman-adv/originator.c
parent8425ec6aea20f8c8e1783d7390f5ea6ca01c58e1 (diff)
downloadblackbird-op-linux-dec05074b1a322f5fbbe3f81bc438a75bfec3c34.tar.gz
blackbird-op-linux-dec05074b1a322f5fbbe3f81bc438a75bfec3c34.zip
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 @@
#include "soft-interface.h"
#include "bridge_loop_avoidance.h"
+/* hash class keys */
+static struct lock_class_key batadv_orig_hash_lock_class_key;
+
static void batadv_purge_orig(struct work_struct *work);
static void batadv_start_purge_timer(struct batadv_priv *bat_priv)
@@ -57,6 +60,9 @@ int batadv_originator_init(struct batadv_priv *bat_priv)
if (!bat_priv->orig_hash)
goto err;
+ batadv_hash_set_lock_class(bat_priv->orig_hash,
+ &batadv_orig_hash_lock_class_key);
+
batadv_start_purge_timer(bat_priv);
return 0;
OpenPOWER on IntegriCloud