From: Sven Eckelmann <sven@narfation.org>
To: b.a.t.m.a.n@lists.open-mesh.org
Subject: [B.A.T.M.A.N.] [PATCH 2/2] batman-adv: Fix namespace for hash_set_lock_class
Date: Fri, 11 May 2012 20:29:47 +0200 [thread overview]
Message-ID: <1336760987-1523-2-git-send-email-sven@narfation.org> (raw)
In-Reply-To: <1336760987-1523-1-git-send-email-sven@narfation.org>
This function was introduced in 2c9aa3b4c37bd55148f5f25212c89e7bf5f28497
without a proper namespace prefix.
Signed-off-by: Sven Eckelmann <sven@narfation.org>
---
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
@@ -1172,9 +1172,10 @@ 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
@@ -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 486b94b..74f74bb 100644
--- a/hash.h
+++ b/hash.h
@@ -46,7 +46,8 @@ 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
next prev parent reply other threads:[~2012-05-11 18:29 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-11 18:29 [B.A.T.M.A.N.] [PATCH 1/2] batman-adv: Prefix non-static functions with batadv_ Sven Eckelmann
2012-05-11 18:29 ` Sven Eckelmann [this message]
2012-05-11 19:15 ` Marek Lindner
2012-05-11 19:23 ` Andrew Lunn
2012-05-11 19:31 ` Sven Eckelmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1336760987-1523-2-git-send-email-sven@narfation.org \
--to=sven@narfation.org \
--cc=b.a.t.m.a.n@lists.open-mesh.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox