The following commit has been merged in the master branch: commit 24c80786e8ba6a0e8b1358d80a1b6c6559ab9f25 Author: Sven Eckelmann sven@narfation.org Date: Fri May 25 08:55:55 2012 +0200

batman-adv: Use batctl indentation of bat_packettype

The style of the indentation was changed in 206af118414355e867e725ea83bc3a2989db5a40

Signed-off-by: Sven Eckelmann sven@narfation.org

diff --git a/packet.h b/packet.h index 205879e..c90219c 100644 --- a/packet.h +++ b/packet.h @@ -23,14 +23,14 @@ #define ETH_P_BATMAN 0x4305 /* unofficial/not registered Ethertype */

enum bat_packettype { - BAT_IV_OGM = 0x01, - BAT_ICMP = 0x02, - BAT_UNICAST = 0x03, - BAT_BCAST = 0x04, - BAT_VIS = 0x05, + BAT_IV_OGM = 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 */