From 063e11aa3eea7f3dcb25074dd61b4af60eb8815a Mon Sep 17 00:00:00 2001
From: Marek Lindner <lindner_marek@yahoo.de>
Date: Fri, 29 Jul 2011 18:31:38 +0200
Subject: [PATCH] --- yaml --- r: 265519 b: refs/heads/master c:
 267151cdfd17c9dd3923c8ed75ef03725cbdd539 h: refs/heads/master i:   265517:
 a9a94468e8946b4eebad2e40f99091a4c20c42d1   265515:
 2771aa7172490217b1368a6f93615ca1446f346a   265511:
 3c75a33edf5a6b3dc54fa52670691a3786874266   265503:
 98dc0426778f67841e5f5a22d0ae9252af8bc7c1 v: v3

---
 [refs]                             | 2 +-
 trunk/net/batman-adv/aggregation.h | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

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);