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