---

yaml --- r: 265519 b: refs/heads/master c: 267151c h: refs/heads/master i: 265517: a9a9446 265515: 2771aa7 265511: 3c75a33 265503: 98dc042 v: v3
git-mirror · Aug 22, 2011 · 063e11a · 063e11a
1 parent 7cca305
commit 063e11a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git 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
@@ -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);