The following commit has been merged in the master branch: commit b3a4f97fb7b11e50537bfae84561893418191b3e Author: Antonio Quartulli ordex@autistici.org Date: Sat Jun 4 18:36:33 2011 +0200

batctl: rename and move TT_* flags/structs to the proper locations

struct tt_change is sent over the wire so need to be in packet.h as well as all the TT_CHANGE_* flags. TT_GLOBAL/CHANGE_ROAM as been renamed to TT_CLIENT_ROAM so that both tt_global_entry and tt_change can use the same same flag.

Signed-off-by: Antonio Quartulli ordex@autistici.org Signed-off-by: Sven Eckelmann sven@narfation.org

diff --git a/packet.h b/packet.h index ae212c7..5e3e778 100644 --- a/packet.h +++ b/packet.h @@ -54,11 +54,15 @@ #define UNI_FRAG_HEAD 0x01 #define UNI_FRAG_LARGETAIL 0x02

-/* TT flags */ +/* TT_QUERY flags */ #define TT_RESPONSE 0x01 #define TT_REQUEST 0x02 #define TT_FULL_TABLE 0x04

+/* TT_CHANGE flags */ +#define TT_CHANGE_DEL 0x01 +#define TT_CLIENT_ROAM 0x02 + struct batman_packet { uint8_t packet_type; uint8_t version; /* batman version field */ @@ -180,4 +184,9 @@ struct roam_adv_packet { uint8_t client[ETH_ALEN]; } __packed;

+struct tt_change { + uint8_t flags; + uint8_t addr[ETH_ALEN]; +}; + #endif /* _NET_BATMAN_ADV_PACKET_H_ */