summaryrefslogtreecommitdiffstats
path: root/net/batman-adv/hash.h
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2011-01-31 22:24:56 +0100
committerDavid S. Miller <davem@davemloft.net>2011-01-31 22:24:56 +0100
commita5e3c2aae23a3719105c1ae662c67ef282f213db (patch)
treef951e78782757dfc2d4b7015601f65101ac2ef73 /net/batman-adv/hash.h
parentbnx2x: Update bnx2x version to 1.62.11-0 (diff)
parentbatman-adv: Merge README of v2011.0.0 release (diff)
downloadlinux-a5e3c2aae23a3719105c1ae662c67ef282f213db.tar.xz
linux-a5e3c2aae23a3719105c1ae662c67ef282f213db.zip
Merge branch 'batman-adv/next' of git://git.open-mesh.org/ecsv/linux-merge
Diffstat (limited to 'net/batman-adv/hash.h')
-rw-r--r--net/batman-adv/hash.h7
1 files changed, 1 insertions, 6 deletions
diff --git a/net/batman-adv/hash.h b/net/batman-adv/hash.h
index 09216ade16f1..eae24402fd0a 100644
--- a/net/batman-adv/hash.h
+++ b/net/batman-adv/hash.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2006-2010 B.A.T.M.A.N. contributors:
+ * Copyright (C) 2006-2011 B.A.T.M.A.N. contributors:
*
* Simon Wunderlich, Marek Lindner
*
@@ -49,11 +49,6 @@ struct hashtable_t {
/* allocates and clears the hash */
struct hashtable_t *hash_new(int size);
-/* remove element if you already found the element you want to delete and don't
- * need the overhead to find it again with hash_remove(). But usually, you
- * don't want to use this function, as it fiddles with hash-internals. */
-void *hash_remove_element(struct hashtable_t *hash, struct element_t *elem);
-
/* free only the hashtable and the hash itself. */
void hash_destroy(struct hashtable_t *hash);