The following commit has been merged in the next branch: commit af01e991adc9ad97110c0468474101f37bbc95cc Author: Sven Eckelmann sven@narfation.org Date: Sat May 5 13:27:27 2012 +0200

batman-adv: Only set hash class after hash is initialized

We must be sure that there was no error during the creation of the hash before we can set the hash lock class. The class set function was added to the wrong place in 2c9aa3b4c37bd55148f5f25212c89e7bf5f28497

Signed-off-by: Sven Eckelmann sven@narfation.org

diff --git a/bridge_loop_avoidance.c b/bridge_loop_avoidance.c index 8bb274b..48831c2 100644 --- a/bridge_loop_avoidance.c +++ b/bridge_loop_avoidance.c @@ -1169,13 +1169,13 @@ int bla_init(struct bat_priv *bat_priv) bat_priv->claim_hash = hash_new(128); bat_priv->backbone_hash = hash_new(32);

+ if (!bat_priv->claim_hash || !bat_priv->backbone_hash) + return -1; + hash_set_lock_class(bat_priv->claim_hash, &claim_hash_lock_class_key); hash_set_lock_class(bat_priv->backbone_hash, &backbone_hash_lock_class_key);

- if (!bat_priv->claim_hash || !bat_priv->backbone_hash) - return -1; - bat_dbg(DBG_BLA, bat_priv, "bla hashes initialized\n");

bla_start_timer(bat_priv);