diff options
| author | Simon Wunderlich <sw@simonwunderlich.de> | 2013-12-02 20:38:30 +0100 |
|---|---|---|
| committer | Antonio Quartulli <antonio@meshcoding.com> | 2013-12-28 12:51:15 +0100 |
| commit | 46b76e0b8b5e21fa5a2387d6f72b193514e7f722 (patch) | |
| tree | a76d23a01a35243e8700168e7fdc8d12671ab476 /net/batman-adv/packet.h | |
| parent | ipv6: release dst properly in ipip6_tunnel_xmit (diff) | |
| download | linux-46b76e0b8b5e21fa5a2387d6f72b193514e7f722.tar.xz linux-46b76e0b8b5e21fa5a2387d6f72b193514e7f722.zip | |
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>
Diffstat (limited to 'net/batman-adv/packet.h')
| -rw-r--r-- | net/batman-adv/packet.h | 4 |
1 files changed, 2 insertions, 2 deletions
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 |