1 files changed, 17 insertions, 7 deletions

diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c
index 945e441b579d..ad6aeedd1497 100644
--- a/net/batman-adv/main.c
+++ b/net/batman-adv/main.c
@@ -419,13 +419,23 @@ static void batadv_recv_handler_init(void)
         for (i = BATADV_UNICAST_MIN; i <= BATADV_UNICAST_MAX; i++)
                 batadv_rx_handler[i] = batadv_recv_unhandled_unicast_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_tvlv_packet, dst) != 4);
-        BUILD_BUG_ON(offsetof(struct batadv_frag_packet, dest) != 4);
-        BUILD_BUG_ON(offsetof(struct batadv_icmp_packet, dst) != 4);
-        BUILD_BUG_ON(offsetof(struct batadv_icmp_packet_rr, dst) != 4);
+        /* compile time checks for sizes */
+        BUILD_BUG_ON(sizeof(struct batadv_bla_claim_dst) != 6);
+        BUILD_BUG_ON(sizeof(struct batadv_ogm_packet) != 24);
+        BUILD_BUG_ON(sizeof(struct batadv_icmp_header) != 20);
+        BUILD_BUG_ON(sizeof(struct batadv_icmp_packet) != 20);
+        BUILD_BUG_ON(sizeof(struct batadv_icmp_packet_rr) != 116);
+        BUILD_BUG_ON(sizeof(struct batadv_unicast_packet) != 10);
+        BUILD_BUG_ON(sizeof(struct batadv_unicast_4addr_packet) != 18);
+        BUILD_BUG_ON(sizeof(struct batadv_frag_packet) != 20);
+        BUILD_BUG_ON(sizeof(struct batadv_bcast_packet) != 14);
+        BUILD_BUG_ON(sizeof(struct batadv_coded_packet) != 46);
+        BUILD_BUG_ON(sizeof(struct batadv_unicast_tvlv_packet) != 20);
+        BUILD_BUG_ON(sizeof(struct batadv_tvlv_hdr) != 4);
+        BUILD_BUG_ON(sizeof(struct batadv_tvlv_gateway_data) != 8);
+        BUILD_BUG_ON(sizeof(struct batadv_tvlv_tt_vlan_data) != 8);
+        BUILD_BUG_ON(sizeof(struct batadv_tvlv_tt_change) != 12);
+        BUILD_BUG_ON(sizeof(struct batadv_tvlv_roam_adv) != 8);
 
         /* broadcast packet */
         batadv_rx_handler[BATADV_BCAST] = batadv_recv_bcast_packet;