From patchwork Fri May 11 19:26:09 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sven Eckelmann X-Patchwork-Id: 1815 Return-Path: Received: from v3-1039.vlinux.de (narfation.org [79.140.41.39]) by open-mesh.org (Postfix) with ESMTPS id 7203B60087F for ; Fri, 11 May 2012 21:26:22 +0200 (CEST) Authentication-Results: open-mesh.org; dkim=pass (1024-bit key) header.i=@narfation.org; dkim-adsp=pass Received: from sven-desktop.home.narfation.org (drsd-4dbd9986.pool.mediaWays.net [77.189.153.134]) by v3-1039.vlinux.de (Postfix) with ESMTPSA id 3ACF9940DC; Fri, 11 May 2012 21:29:13 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=narfation.org; s=mail; t=1336764553; bh=kC5W2w5du1jnA+3FcLs95pj8jq0e64KgAHG+9rCOKnE=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References; b=dl8hdX6hdK7J3we7x+2kgbj1i5ldxbVQ3r3i21ZmuIBMjrJGocO4UbO4EKEkMFpNK kS8XewxqKDoMylqO+OPfx8GzEgSFHFgczD5tNM7SUJFPSf6UQC4Omfdiyef5/rseQ1 uRhMMhNjzWcq8RBkNEJVQ5hBoyUwCEJ9KSCI5sVU= From: Sven Eckelmann To: b.a.t.m.a.n@lists.open-mesh.org Date: Fri, 11 May 2012 21:26:09 +0200 Message-Id: <1336764370-10653-2-git-send-email-sven@narfation.org> X-Mailer: git-send-email 1.7.10 In-Reply-To: <1336764370-10653-1-git-send-email-sven@narfation.org> References: <1336764370-10653-1-git-send-email-sven@narfation.org> Subject: [B.A.T.M.A.N.] [PATCHv2 2/3] batman-adv: Fix namespace for hash_set_lock_class X-BeenThere: b.a.t.m.a.n@lists.open-mesh.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: The list for a Better Approach To Mobile Ad-hoc Networking List-Id: The list for a Better Approach To Mobile Ad-hoc Networking List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 May 2012 19:26:22 -0000 This function was introduced in 2c9aa3b4c37bd55148f5f25212c89e7bf5f28497 without a proper namespace prefix. Signed-off-by: Sven Eckelmann --- 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);