[B.A.T.M.A.N.] [PATCH] batman-adv: correctly align the tt_tvlv_data struct

[B.A.T.M.A.N.] [PATCH] batman-adv: correctly align the tt_tvlv_data struct

[Antonio Quartulli]

4bytes long members must start at an address multiple of 4
in order to avoid unaligned memory access.

Add 2 padding bytes to satisfy this requirement.

Introduced by c5e7a06a29612056006e4dc01910c0b44e858583
"batman-adv: use CRC32C instead of CRC16 in TT code"

Signed-off-by: Antonio Quartulli <ordex@autistici.org>
---
 packet.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packet.h b/packet.h
index 21254a4..8675b52 100644
--- a/packet.h
+++ b/packet.h
@@ -391,11 +391,13 @@ struct batadv_tvlv_gateway_data {
  * struct batadv_tvlv_tt_data - tt data propagated through the tt tvlv container
  * @flags: translation table flags (see batadv_tt_data_flags)
  * @ttvn: translation table version number
+ * @reserved: not used, useful for alignment purposes
  * @crc: crc32 checksum of the local translation table
  */
 struct batadv_tvlv_tt_data {
 	uint8_t flags;
 	uint8_t ttvn;
+	uint16_t reserved;
 	__be32  crc;
 };
 
-- 
1.8.1.5

Re: [B.A.T.M.A.N.] [PATCH] batman-adv: correctly align the tt_tvlv_data struct

[Marek Lindner]

On Friday, May 24, 2013 21:04:44 Antonio Quartulli wrote:
> 4bytes long members must start at an address multiple of 4
> in order to avoid unaligned memory access.
> 
> Add 2 padding bytes to satisfy this requirement.
> 
> Introduced by c5e7a06a29612056006e4dc01910c0b44e858583
> "batman-adv: use CRC32C instead of CRC16 in TT code"
> 
> Signed-off-by: Antonio Quartulli <ordex@autistici.org>
> ---
>  packet.h | 2 ++
>  1 file changed, 2 insertions(+)

Applied in revision 2fb072a.

Thanks,
Marek