The following commit has been merged in the master branch: commit fe704bfb0323158598b998a28c2aa99b38682a14 Author: Antonio Quartulli ordex@autistici.org Date: Thu Jun 30 01:13:59 2011 +0200

batman-adv: split tt_local/global_entry flags field for local and remote computations

The tt_global/local_entry 'flags' field contains flags used either for local and remote computations. To optimise the usage of this field, its length has been increased to 16bit in order to use the eight leading bits (from 0 to 7) to store flags that have to be sent on the wire, while the eight ending ones are used for local computation only.

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

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

-/* TT_CLIENT flags */ +/* TT_CLIENT flags. + * Flags from 1 to 1 << 7 are sent on the wire, while flags from 1 << 8 to + * 1 << 15 are used for local computation only */ enum tt_client_flags { - TT_CLIENT_DEL = 0x01, - TT_CLIENT_ROAM = 0x02, - TT_CLIENT_NOPURGE = 0x04 + TT_CLIENT_DEL = 1 << 0, + TT_CLIENT_ROAM = 1 << 1, + TT_CLIENT_NOPURGE = 1 << 8 };

struct batman_packet {