summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorSimon Wunderlich <sw@simonwunderlich.de>2013-12-02 20:38:33 +0100
committerAntonio Quartulli <antonio@meshcoding.com>2013-12-28 12:51:17 +0100
commit2f7a318219186485c175339758ac42a03644200b (patch)
treec818007dfcca7e20b9151b188a6c9488e5f79a56 /net
parent27a417e6badac911487c10990e04f5ccbb11b1b2 (diff)
downloadlinux-2f7a318219186485c175339758ac42a03644200b.tar.gz
linux-2f7a318219186485c175339758ac42a03644200b.tar.bz2
linux-2f7a318219186485c175339758ac42a03644200b.zip
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>
Diffstat (limited to 'net')
-rw-r--r--net/batman-adv/packet.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/batman-adv/packet.h b/net/batman-adv/packet.h
index 2a857ed006fd..04cf27ca5dee 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