From b1112ce0c98a462f0787f4125a15e96045183ba1 Mon Sep 17 00:00:00 2001 From: Antonio Quartulli Date: Fri, 6 Jan 2012 21:31:33 +0100 Subject: [PATCH] --- yaml --- r: 290491 b: refs/heads/master c: c40ed2bfa6cc30174d5c547b37bcd6528c830ef4 h: refs/heads/master i: 290489: e86a66a5b73e47141bca521ef153e3751aff1bdc 290487: a1ad3fb619e459662b83f2cb8cba37993fbc79bb v: v3 --- [refs] | 2 +- trunk/net/batman-adv/translation-table.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index faade5a55557..4b534c3cd1d6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 567db7b0b7c0a94cc62846f8ebb429bdda2884bc +refs/heads/master: c40ed2bfa6cc30174d5c547b37bcd6528c830ef4 diff --git a/trunk/net/batman-adv/translation-table.c b/trunk/net/batman-adv/translation-table.c index 4dc5af334f6b..9be9c41c529b 100644 --- a/trunk/net/batman-adv/translation-table.c +++ b/trunk/net/batman-adv/translation-table.c @@ -210,6 +210,11 @@ void tt_local_add(struct net_device *soft_iface, const uint8_t *addr, if (compare_eth(addr, soft_iface->dev_addr)) tt_local_entry->common.flags |= TT_CLIENT_NOPURGE; + /* The local entry has to be marked as NEW to avoid to send it in + * a full table response going out before the next ttvn increment + * (consistency check) */ + tt_local_entry->common.flags |= TT_CLIENT_NEW; + hash_added = hash_add(bat_priv->tt_local_hash, compare_tt, choose_orig, &tt_local_entry->common, &tt_local_entry->common.hash_entry); @@ -222,11 +227,6 @@ void tt_local_add(struct net_device *soft_iface, const uint8_t *addr, tt_local_event(bat_priv, addr, tt_local_entry->common.flags); - /* The local entry has to be marked as NEW to avoid to send it in - * a full table response going out before the next ttvn increment - * (consistency check) */ - tt_local_entry->common.flags |= TT_CLIENT_NEW; - /* remove address from global hash if present */ tt_global_entry = tt_global_hash_find(bat_priv, addr);