Repository : ssh://git@open-mesh.org/batman-adv

On branch : next

commit 79dc2c28f6c18f6010f11d5ecc3612839c304a27 Merge: 7cfe135 d46bf9e Author: Marek Lindner lindner_marek@yahoo.de Date: Thu Nov 8 21:35:43 2012 +0800

Merge branch 'maint' into next

79dc2c28f6c18f6010f11d5ecc3612839c304a27 translation-table.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)

diff --cc translation-table.c index 451a1a5,fec1a00..cb0281a --- a/translation-table.c +++ b/translation-table.c @@@ -859,8 -767,14 +859,14 @@@ int batadv_tt_global_add(struct batadv_ /* if the client was temporary added before receiving the first * OGM announcing it, we have to clear the TEMP flag */ - tt_global_entry->common.flags &= ~BATADV_TT_CLIENT_TEMP; + common->flags &= ~BATADV_TT_CLIENT_TEMP;

+ /* the change can carry possible "attribute" flags like the + * TT_CLIENT_WIFI, therefore they have to be copied in the + * client entry + */ + tt_global_entry->common.flags |= flags; + /* If there is the BATADV_TT_CLIENT_ROAM flag set, there is only * one originator left in the list and we previously received a * delete + roaming change for this originator.