--- batman-adv_master.packet.h 2011-08-19 00:15:01.979117898 +0200 +++ batctl_master.packet.h 2011-08-19 00:15:01.983119420 +0200 @@ -25,14 +25,14 @@ #define ETH_P_BATMAN 0x4305 /* unofficial/not registered Ethertype */

enum bat_packettype { - BAT_OGM = 0x01, - BAT_ICMP = 0x02, - BAT_UNICAST = 0x03, - BAT_BCAST = 0x04, - BAT_VIS = 0x05, + BAT_PACKET = 0x01, + BAT_ICMP = 0x02, + BAT_UNICAST = 0x03, + BAT_BCAST = 0x04, + BAT_VIS = 0x05, BAT_UNICAST_FRAG = 0x06, - BAT_TT_QUERY = 0x07, - BAT_ROAM_ADV = 0x08 + BAT_TT_QUERY = 0x07, + BAT_ROAM_ADV = 0x08 };

/* this file is included by batctl which needs these defines */ @@ -90,7 +90,7 @@ TT_CLIENT_PENDING = 1 << 10 };

-struct batman_ogm_packet { +struct batman_packet { uint8_t packet_type; uint8_t version; /* batman version field */ uint8_t ttl; @@ -105,7 +105,7 @@ uint16_t tt_crc; } __packed;

-#define BATMAN_OGM_LEN sizeof(struct batman_ogm_packet) +#define BAT_PACKET_LEN sizeof(struct batman_packet)

struct icmp_packet { uint8_t packet_type;