The following commit has been merged in the next branch: commit cb9386840f46acc640885b98352c63c448afd7a7 Author: Marek Lindner lindner_marek@yahoo.de Date: Thu May 10 12:51:40 2012 +0800

batman-adv: change comment style for David

Should be merged with f76d019194e0a88c57371df169ecc979690a04c2

Signed-off-by: Marek Lindner lindner_marek@yahoo.de

diff --git a/bat_iv_ogm.c b/bat_iv_ogm.c index 96ce556..bcaa818 100644 --- a/bat_iv_ogm.c +++ b/bat_iv_ogm.c @@ -518,13 +518,12 @@ static void bat_iv_ogm_forward(struct orig_node *orig_node, }

if (!is_from_best_next_hop) { - /** - * Mark the forwarded packet when it is not coming from our best - * next hop. We still need to forward the packet for our neighbor - * link quality detection to work in case the packet originated - * from a single hop neighbor. Otherwise we can simply drop the - * ogm. - */ + /* Mark the forwarded packet when it is not coming from our + * best next hop. We still need to forward the packet for our + * neighbor link quality detection to work in case the packet + * originated from a single hop neighbor. Otherwise we can + * simply drop the ogm. + */ if (is_single_hop_neigh) batman_ogm_packet->flags |= NOT_BEST_NEXT_HOP; else