From: Simon Wunderlich <sw@simonwunderlich.de>
Date: Mon, 2 Dec 2013 19:38:30 +0000 (+0100)
Subject: batman-adv: fix alignment for batadv_coded_packet
X-Git-Tag: v3.13-rc7~13^2~6^2~6
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=46b76e0b8b5e21fa5a2387d6f72b193514e7f722;p=linux.git

batman-adv: fix alignment for batadv_coded_packet

The compiler may decide to pad the structure, and then it does not
have the expected size of 46 byte. Fix this by moving it in the
pragma pack(2) part of the code.

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 207459b62966..10597a6729a6 100644
--- a/net/batman-adv/packet.h
+++ b/net/batman-adv/packet.h
@@ -315,8 +315,6 @@ struct batadv_bcast_packet {
 	 */
 };
 
-#pragma pack()
-
 /**
  * struct batadv_coded_packet - network coded packet
  * @header: common batman packet header and ttl of first included packet
@@ -349,6 +347,8 @@ struct batadv_coded_packet {
 	__be16   coded_len;
 };
 
+#pragma pack()
+
 /**
  * struct batadv_unicast_tvlv - generic unicast packet with tvlv payload
  * @header: common batman packet header