The following commit has been merged in the master branch: commit e4172b0c922f6b4242e1e64789c47bd30afc55e9 Author: Simon Wunderlich simon.wunderlich@s2003.tu-chemnitz.de Date: Sun Jan 22 19:40:40 2012 +0100

batman-adv: fix initialised flag for tt request/responses

When receiving a tt_response, we first delete the old entries and set the initialised flag to false, then add the new received entries, but forgot to set the initialised flag to true again. This may lead to endless loops of requests/responses, as a request is always issued if the initialised flag is not set.

This is a regression introduced by 8ef201e01c57e3bfbcb7f6db69405ff259c2b907.

Fix this by moving initialised = true from tt_update_changes() to _tt_update_changes().

Signed-off-by: Simon Wunderlich siwu@hrz.tu-chemnitz.de

diff --git a/translation-table.c b/translation-table.c index 27753a0..9a6f315 100644 --- a/translation-table.c +++ b/translation-table.c @@ -1434,6 +1434,7 @@ static void _tt_update_changes(struct bat_priv *bat_priv, */ return; } + orig_node->tt_initialised = true; }

static void tt_fill_gtable(struct bat_priv *bat_priv, @@ -1476,7 +1477,6 @@ static void tt_update_changes(struct bat_priv *bat_priv, tt_save_orig_buffer(bat_priv, orig_node, (unsigned char *)tt_change, tt_num_changes); atomic_set(&orig_node->last_ttvn, ttvn); - orig_node->tt_initialised = true; }

bool is_my_client(struct bat_priv *bat_priv, const uint8_t *addr)