Staging: batman-adv: initialize static hash iterators

instead of dynamically registering hash iterators, calling functions are
changed to register the iterator objects statically. The two advantages are:

 * no memory leaks when aborting from hash_iterate()
 * no calls to kmalloc/kfree, therefore a little faster/safer

Tested with 9 QEMU instances, no obvious regression found.

Signed-off-by: Simon Wunderlich <siwu@hrz.tu-chemnitz.de>
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/staging/batman-adv/routing.c b/drivers/staging/batman-adv/routing.c
index e8d712788da..68dea76b0ca 100644
--- a/drivers/staging/batman-adv/routing.c
+++ b/drivers/staging/batman-adv/routing.c
@@ -40,14 +40,14 @@ static atomic_t data_ready_cond;
 atomic_t exit_cond;
 void slide_own_bcast_window(struct batman_if *batman_if)
 {
-        struct hash_it_t *hashit = NULL;
+        HASHIT(hashit);
         struct orig_node *orig_node;
         TYPE_OF_WORD *word;
 
         spin_lock(&orig_hash_lock);
 
-        while (NULL != (hashit = hash_iterate(orig_hash, hashit))) {
-                orig_node = hashit->bucket->data;
+        while (hash_iterate(orig_hash, &hashit)) {
+                orig_node = hashit.bucket->data;
                 word = &(orig_node->bcast_own[batman_if->if_num * NUM_WORDS]);
 
                 bit_get_packet(word, 1, 0);