Skip to content

Commit

Permalink
Staging: batman-adv: process OGMs bigger than MAX_AGGREGATION_BYTES
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Marek Lindner authored and Greg Kroah-Hartman committed Oct 19, 2010
1 parent 15f0068 commit 1bc80e9
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions drivers/staging/batman-adv/aggregation.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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));
}

0 comments on commit 1bc80e9

Please sign in to comment.