The following commit has been merged in the master branch: commit 583dc48e206a50b38e4039270247fc33bff10114 Author: Antonio Quartulli ordex@autistici.org Date: Mon Jun 13 22:51:40 2011 +0200

batctl: unify flags for tt_change/tt_local_entry/tt_global_entry

The tt_local_entry structure now has a 'flags' field. This helps to unify the flags format to all the client related structures (tt_global_entry and tt_change). The 'never_purge' field is now encoded in the 'flags' one.

Moreover 'enum tt_change_flags' is now called 'enum tt_client_flags' and the defined values apply to the tt_local_entry, tt_global_entry and the tt_change 'flags' field.

Signed-off-by: Antonio Quartulli ordex@autistici.org

diff --git a/packet.h b/packet.h index c5f081d..8fd2fde 100644 --- a/packet.h +++ b/packet.h @@ -78,10 +78,11 @@ enum tt_query_flags { TT_FULL_TABLE = 1 << 2 };

-/* TT_CHANGE flags */ -enum tt_change_flags { - TT_CHANGE_DEL = 0x01, - TT_CLIENT_ROAM = 0x02 +/* TT_CLIENT flags */ +enum tt_client_flags { + TT_CLIENT_DEL = 0x01, + TT_CLIENT_ROAM = 0x02, + TT_CLIENT_NOPURGE = 0x04 };

struct batman_packet {