diff options
| author | David S. Miller <davem@davemloft.net> | 2012-06-26 03:15:58 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-06-26 03:18:10 +0400 |
| commit | 1d5873e9d75bb72012a6c1327a368d0d2b13581f (patch) | |
| tree | 20f4d5b75bdffbf1945008aabec946b8ff3f5053 /net/batman-adv/hash.c | |
| parent | 7665de15642dfb1709177517aa0488162727342c (diff) | |
| parent | a513088d022c8f59cebe17c567797c220563b517 (diff) | |
| download | linux-1d5873e9d75bb72012a6c1327a368d0d2b13581f.tar.xz | |
Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge
Included changes:
- yet another batch of 'namespace cleaning' patches
Conflicts:
net/batman-adv/translation-table.c
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/batman-adv/hash.c')
| -rw-r--r-- | net/batman-adv/hash.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/batman-adv/hash.c b/net/batman-adv/hash.c index e39f8f4bb165..1fb961c8d9a0 100644 --- a/net/batman-adv/hash.c +++ b/net/batman-adv/hash.c @@ -21,7 +21,7 @@ #include "hash.h" /* clears the hash */ -static void hash_init(struct hashtable_t *hash) +static void batadv_hash_init(struct hashtable_t *hash) { uint32_t i; @@ -58,7 +58,7 @@ struct hashtable_t *batadv_hash_new(uint32_t size) goto free_table; hash->size = size; - hash_init(hash); + batadv_hash_init(hash); return hash; free_table: |