From 17ec498931d26b66ea2a2daad5cc760b7d24eb57 Mon Sep 17 00:00:00 2001
From: Marek Lindner <lindner_marek@yahoo.de>
Date: Tue, 19 Oct 2010 11:59:15 +0200
Subject: [PATCH] --- yaml --- r: 220383 b: refs/heads/master c:
 1bc80e95274a96f1bd6af25bb65f33cef57f6704 h: refs/heads/master i:   220381:
 f7543703c2d6880238f6a01a326673faaede3cb7   220379:
 4be5a0bafbc8b0e9d8ceedd5479d0097fa9c2f2b   220375:
 b01ec84b57f5da0f019bd405f6ef0acc5d40ae2a   220367:
 a8226f0fbc994ccd7830d0e3c512b70e48caa3cb   220351:
 2637c1302711c101ca877b7268d1306ea7fed0fe v: v3

---
 [refs]                                         | 2 +-
 trunk/drivers/staging/batman-adv/aggregation.c | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 076e7822c194..b8778044c033 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 15f00687e3b7b88c23d498d2c65e5911d8efa214
+refs/heads/master: 1bc80e95274a96f1bd6af25bb65f33cef57f6704
diff --git a/trunk/drivers/staging/batman-adv/aggregation.c b/trunk/drivers/staging/batman-adv/aggregation.c
index 16b268ea7aef..08624d44e231 100644
--- a/trunk/drivers/staging/batman-adv/aggregation.c
+++ b/trunk/drivers/staging/batman-adv/aggregation.c
@@ -257,9 +257,7 @@ void receive_aggr_bat_packet(struct ethhdr *ethhdr, unsigned char *packet_buff,
 
 	batman_packet = (struct batman_packet *)packet_buff;
 
-	while (aggregated_packet(buff_pos, packet_len,
-				 batman_packet->num_hna)) {
-
+	do {
 		/* network to host order for our 32bit seqno, and the
 		   orig_interval. */
 		batman_packet->seqno = ntohl(batman_packet->seqno);
@@ -272,5 +270,6 @@ void receive_aggr_bat_packet(struct ethhdr *ethhdr, unsigned char *packet_buff,
 		buff_pos += BAT_PACKET_LEN + hna_len(batman_packet);
 		batman_packet = (struct batman_packet *)
 			(packet_buff + buff_pos);
-	}
+	} while (aggregated_packet(buff_pos, packet_len,
+				   batman_packet->num_hna));
 }