The following commit has been merged in the master branch: commit 2f7a318219186485c175339758ac42a03644200b Author: Simon Wunderlich sw@simonwunderlich.de Date: Mon Dec 2 20:38:33 2013 +0100

batman-adv: fix size of batadv_bla_claim_dst

Since this is a mac address and always 48 bit, and we can assume that it is always aligned to 2-byte boundaries, add a pack(2) pragma.

Signed-off-by: Simon Wunderlich sw@simonwunderlich.de Signed-off-by: Marek Lindner mareklindner@neomailbox.ch Signed-off-by: Antonio Quartulli antonio@meshcoding.com

diff --git a/net/batman-adv/packet.h b/net/batman-adv/packet.h index 2a857ed..04cf27c 100644 --- a/net/batman-adv/packet.h +++ b/net/batman-adv/packet.h @@ -155,6 +155,7 @@ enum batadv_tvlv_type { BATADV_TVLV_ROAM = 0x05, };

+#pragma pack(2) /* the destination hardware field in the ARP frame is used to * transport the claim type and the group id */ @@ -163,6 +164,7 @@ struct batadv_bla_claim_dst { uint8_t type; /* bla_claimframe */ __be16 group; /* group id */ }; +#pragma pack()

/** * struct batadv_ogm_packet - ogm (routing protocol) packet