[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 80067c8320aebab6d740e07be6ecf3dd04787f60
Author: Simon Wunderlich <simon.wunderlich at s2003.tu-chemnitz.de>
Date:   Thu Apr 25 10:37:22 2013 +0200

    batman-adv: add build check macros for packet member offset
    
    Since we removed the __packed from most of the packets, we should
    make sure that the offset generated by the compiler are correct for
    sent/received data.
    
    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/main.c b/net/batman-adv/main.c
index 43dc92e..b22368e 100644
--- a/net/batman-adv/main.c
+++ b/net/batman-adv/main.c
@@ -393,6 +393,14 @@ static void batadv_recv_handler_init(void)
 	for (i = 0; i < ARRAY_SIZE(batadv_rx_handler); i++)
 		batadv_rx_handler[i] = batadv_recv_unhandled_packet;
 
+	/* compile time checks for struct member offsets */
+	BUILD_BUG_ON(offsetof(struct batadv_unicast_4addr_packet, src) != 10);
+	BUILD_BUG_ON(offsetof(struct batadv_unicast_packet, dest) != 4);
+	BUILD_BUG_ON(offsetof(struct batadv_unicast_frag_packet, dest) != 4);
+	BUILD_BUG_ON(offsetof(struct batadv_unicast_tvlv_packet, dst) != 4);
+	BUILD_BUG_ON(offsetof(struct batadv_icmp_packet, dst) != 4);
+	BUILD_BUG_ON(offsetof(struct batadv_icmp_packet_rr, dst) != 4);
+
 	/* batman icmp packet */
 	batadv_rx_handler[BATADV_ICMP] = batadv_recv_icmp_packet;
 	/* unicast with 4 addresses packet */

-- 
LinuxNextTracking


More information about the linux-merge mailing list