Browse Source

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>
Simon Wunderlich 12 years ago
parent
commit
46b76e0b8b
1 changed files with 2 additions and 2 deletions
  1. 2 2
      net/batman-adv/packet.h

+ 2 - 2
net/batman-adv/packet.h

@@ -315,8 +315,6 @@ struct batadv_bcast_packet {
 	 */
 	 */
 };
 };
 
 
-#pragma pack()
-
 /**
 /**
  * struct batadv_coded_packet - network coded packet
  * struct batadv_coded_packet - network coded packet
  * @header: common batman packet header and ttl of first included packet
  * @header: common batman packet header and ttl of first included packet
@@ -349,6 +347,8 @@ struct batadv_coded_packet {
 	__be16   coded_len;
 	__be16   coded_len;
 };
 };
 
 
+#pragma pack()
+
 /**
 /**
  * struct batadv_unicast_tvlv - generic unicast packet with tvlv payload
  * struct batadv_unicast_tvlv - generic unicast packet with tvlv payload
  * @header: common batman packet header
  * @header: common batman packet header