diff --git a/[refs] b/[refs]
index f8f7663f529f..a5103949033e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: df6edb9e69cdb29b31b27305f60bb400dd5d91ed
+refs/heads/master: 267151cdfd17c9dd3923c8ed75ef03725cbdd539
diff --git a/trunk/net/batman-adv/aggregation.h b/trunk/net/batman-adv/aggregation.h
index 216337bb841f..df4a5a943088 100644
--- a/trunk/net/batman-adv/aggregation.h
+++ b/trunk/net/batman-adv/aggregation.h
@@ -28,8 +28,7 @@
 static inline int aggregated_packet(int buff_pos, int packet_len,
 				    int tt_num_changes)
 {
-	int next_buff_pos = buff_pos + BAT_PACKET_LEN + (tt_num_changes *
-						sizeof(struct tt_change));
+	int next_buff_pos = buff_pos + BAT_PACKET_LEN + tt_len(tt_num_changes);
 
 	return (next_buff_pos <= packet_len) &&
 		(next_buff_pos <= MAX_AGGREGATION_BYTES);