[linux-next] LinuxNextTracking branch, master, updated. next-20131029

batman at open-mesh.org batman at open-mesh.org
Wed Oct 30 00:18:01 CET 2013

The following commit has been merged in the master branch:
commit 9284a47e8bd7d19fc1230cc8d5982820d357c3ed
Author: Simon Wunderlich <simon.wunderlich at s2003.tu-chemnitz.de>
Date:   Thu Apr 25 10:37:24 2013 +0200

    batman-adv: remove packed from batadv_ogm_packet
    As we decreased the struct size from 26 to 24 byte, we can remove
    __packed as the compiler will not add any more padding.
    Signed-off-by: Simon Wunderlich <siwu at hrz.tu-chemnitz.de>
    Signed-off-by: Marek Lindner <lindner_marek at yahoo.de>
    Signed-off-by: Antonio Quartulli <antonio at meshcoding.com>

diff --git a/net/batman-adv/packet.h b/net/batman-adv/packet.h
index f02dbb1..4e5fe7d 100644
--- a/net/batman-adv/packet.h
+++ b/net/batman-adv/packet.h
@@ -175,7 +175,10 @@ struct batadv_ogm_packet {
 	uint8_t  reserved;
 	uint8_t  tq;
 	__be16   tvlv_len;
-} __packed;
+	/* __packed is not needed as the struct size is divisible by 4,
+	 * and the largest data type in this struct has a size of 4.
+	 */
 #define BATADV_OGM_HLEN sizeof(struct batadv_ogm_packet)


More information about the linux-merge mailing list