Staging: batman-adv: process OGMs bigger than MAX_AGGREGATION_BYTES

Reported-by: Sam Yeung <sam.cwyeung@gmail.com>
Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
Signed-off-by: Sven Eckelmann <sven.eckelmann@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/batman-adv/aggregation.c b/drivers/staging/batman-adv/aggregation.c
index 16b268ea7aefd7bdf2900622cac203a4dc479f25..08624d44e231f625de452634cb0c17963b51d5cf 100644 (file)
--- a/drivers/staging/batman-adv/aggregation.c
+++ b/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));
 }