Sven Eckelmann | 11 May 2012 20:29
Favicon

[PATCH 2/2] 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@...>
---
 bridge_loop_avoidance.c |    7 ++++---
 hash.c                  |    3 ++-
 hash.h                  |    3 ++-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/bridge_loop_avoidance.c b/bridge_loop_avoidance.c
index 0c5a3ef..27f451a 100644
--- a/bridge_loop_avoidance.c
+++ b/bridge_loop_avoidance.c
 <at>  <at>  -1172,9 +1172,10  <at>  <at>  int batadv_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 260d092..439f5d7 100644
--- a/hash.c
+++ b/hash.c
 <at>  <at>  -70,7 +70,8  <at>  <at>  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 486b94b..74f74bb 100644
--- a/hash.h
+++ b/hash.h
 <at>  <at>  -46,7 +46,8  <at>  <at>  struct hashtable_t {
 struct hashtable_t *batadv_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 batadv_hash_destroy(struct hashtable_t *hash);
--

-- 
1.7.10


Gmane