The following commit has been merged in the master branch: commit a51ca5f52c22b066a1df6ff7456ec5fb121a01a6 Author: Sven Eckelmann sven@narfation.org Date: Sat May 12 02:09:21 2012 +0200
batman-adv: Fix namespace for hash_set_lock_class
This function was introduced in 2c9aa3b4c37bd55148f5f25212c89e7bf5f28497 without a proper namespace prefix.
Signed-off-by: Sven Eckelmann sven@narfation.org
diff --git a/bridge_loop_avoidance.c b/bridge_loop_avoidance.c index 89e9721..314e37b 100644 --- a/bridge_loop_avoidance.c +++ b/bridge_loop_avoidance.c @@ -1172,9 +1172,10 @@ int bla_init(struct bat_priv *bat_priv) if (!bat_priv->claim_hash || !bat_priv->backbone_hash) return -ENOMEM;
- 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); + batadv_hash_set_lock_class(bat_priv->claim_hash, + &claim_hash_lock_class_key); + batadv_hash_set_lock_class(bat_priv->backbone_hash, + &backbone_hash_lock_class_key);
bat_dbg(DBG_BLA, bat_priv, "bla hashes initialized\n");
diff --git a/hash.c b/hash.c index 4578c20..a7dcff0 100644 --- a/hash.c +++ b/hash.c @@ -70,7 +70,8 @@ free_hash: return NULL; }
-void hash_set_lock_class(struct hashtable_t *hash, struct lock_class_key *key) +void batadv_hash_set_lock_class(struct hashtable_t *hash, + struct lock_class_key *key) { uint32_t i;
diff --git a/hash.h b/hash.h index 2e0409a..3d67ce4 100644 --- a/hash.h +++ b/hash.h @@ -46,7 +46,8 @@ struct hashtable_t { struct hashtable_t *hash_new(uint32_t size);
/* set class key for all locks */ -void hash_set_lock_class(struct hashtable_t *hash, struct lock_class_key *key); +void batadv_hash_set_lock_class(struct hashtable_t *hash, + struct lock_class_key *key);
/* free only the hashtable and the hash itself. */ void hash_destroy(struct hashtable_t *hash);