From patchwork Tue Dec 2 11:16:29 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Pargmann X-Patchwork-Id: 4221 Return-Path: Received-SPF: None (no SPF record) identity=mailfrom; client-ip=92.198.50.35; helo=metis.ext.pengutronix.de; envelope-from=mpa@pengutronix.de; receiver=b.a.t.m.a.n@lists.open-mesh.org Received: from metis.ext.pengutronix.de (metis.ext.pengutronix.de [92.198.50.35]) by open-mesh.org (Postfix) with ESMTPS id E037760176A for ; Tue, 2 Dec 2014 12:41:00 +0100 (CET) Received: from dude.hi.pengutronix.de ([2001:67c:670:100:1d::7]) by metis.ext.pengutronix.de with esmtp (Exim 4.72) (envelope-from ) id 1XvlYU-0003LS-Lk; Tue, 02 Dec 2014 12:23:42 +0100 Received: from mpa by dude.hi.pengutronix.de with local (Exim 4.84) (envelope-from ) id 1XvlYP-0001Yi-KX; Tue, 02 Dec 2014 12:23:37 +0100 From: Markus Pargmann To: Marek Lindner , Simon Wunderlich , Antonio Quartulli Date: Tue, 2 Dec 2014 12:16:29 +0100 Message-Id: <1417519009-20699-12-git-send-email-mpa@pengutronix.de> X-Mailer: git-send-email 2.1.3 In-Reply-To: <1417519009-20699-1-git-send-email-mpa@pengutronix.de> References: <1417519009-20699-1-git-send-email-mpa@pengutronix.de> X-SA-Exim-Connect-IP: 2001:67c:670:100:1d::7 X-SA-Exim-Mail-From: mpa@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: b.a.t.m.a.n@lists.open-mesh.org Cc: b.a.t.m.a.n@lists.open-mesh.org Subject: [B.A.T.M.A.N.] [PATCH 11/31] batman-adv: hash, make struct hashtable private X-BeenThere: b.a.t.m.a.n@lists.open-mesh.org X-Mailman-Version: 2.1.15 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: Tue, 02 Dec 2014 11:41:01 -0000 All accesses to the struct hashtable were replaced by accessor functions so we can move the struct into the private scope of the hashtable implementation. Signed-off-by: Markus Pargmann --- hash.c | 6 ++++++ hash.h | 8 ++------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/hash.c b/hash.c index d3313b54347c..1d3e5ebaa7ad 100644 --- a/hash.c +++ b/hash.c @@ -18,6 +18,12 @@ #include "main.h" #include "hash.h" +struct batadv_hashtable { + struct hlist_head *table; /* the hashtable itself with the buckets */ + spinlock_t *list_locks; /* spinlock for each hash list entry */ + uint32_t size; /* size of hashtable */ +}; + uint32_t batadv_hash_size(struct batadv_hashtable *hash) { return hash->size; diff --git a/hash.h b/hash.h index d0681ecac0f0..8f5f832acd7c 100644 --- a/hash.h +++ b/hash.h @@ -20,6 +20,8 @@ #include +struct batadv_hashtable; + /* callback to a compare function. should compare 2 element datas for their * keys, return 0 if same and not 0 if not same */ @@ -33,12 +35,6 @@ typedef int (*batadv_hashdata_compare_cb)(const struct hlist_node *, typedef uint32_t (*batadv_hashdata_choose_cb)(const void *, uint32_t); typedef void (*batadv_hashdata_free_cb)(struct hlist_node *, void *); -struct batadv_hashtable { - struct hlist_head *table; /* the hashtable itself with the buckets */ - spinlock_t *list_locks; /* spinlock for each hash list entry */ - uint32_t size; /* size of hashtable */ -}; - /* allocates and clears the hash */ struct batadv_hashtable *batadv_hash_new(uint32_t size);